diff options
| -rw-r--r-- | src/arch/armv7/Makefile.inc | 25 | ||||
| -rw-r--r-- | src/arch/armv7/boot.c (renamed from src/arch/armv7/boot/boot.c) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/boot/Makefile.inc | 12 | ||||
| -rw-r--r-- | src/arch/armv7/cache.c (renamed from src/arch/armv7/lib/cache.c) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/div0.c (renamed from src/arch/armv7/lib/div0.c) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/eabi_compat.c (renamed from src/arch/armv7/lib/eabi_compat.c) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/early_console.c (renamed from src/arch/armv7/lib/early_console.c) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/id.inc (renamed from src/arch/armv7/lib/id.inc) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/interrupts.c (renamed from src/arch/armv7/lib/interrupts.c) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/lib/Makefile.inc | 20 | ||||
| -rw-r--r-- | src/arch/armv7/memcpy.S (renamed from src/arch/armv7/lib/memcpy.S) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/memset.S (renamed from src/arch/armv7/lib/memset.S) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/mmu.c (renamed from src/arch/armv7/lib/mmu.c) | 0 | ||||
| -rw-r--r-- | src/arch/armv7/tables.c (renamed from src/arch/armv7/boot/tables.c) | 0 |
14 files changed, 24 insertions, 33 deletions
diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc index 8637ef434e..1ef78d19a8 100644 --- a/src/arch/armv7/Makefile.inc +++ b/src/arch/armv7/Makefile.inc @@ -161,6 +161,29 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDD ramstage-y += exception.c ramstage-y += exception_asm.S +bootblock-$(CONFIG_EARLY_CONSOLE) += early_console.c +bootblock-y += cache.c + +romstage-y += cache.c +romstage-y += div0.c +romstage-$(CONFIG_EARLY_CONSOLE) += early_console.c + +ramstage-y += div0.c +#ramstage-y += interrupts.c +#ramstage-y += memcpy.S +#ramstage-y += memset.S +ramstage-y += cache.c +ramstage-y += mmu.c + +romstage-y += eabi_compat.c +ramstage-y += eabi_compat.c +bootblock-y += eabi_compat.c + +ramstage-y += boot.c +ramstage-y += tables.c + +$(obj)/arch/armv7/coreboot_table.ramstage.o : $(OPTION_TABLE_H) + romstage-srcs += $(objgenerated)/crt0.s ramstage-srcs += $(wildcard src/mainboard/$(MAINBOARDDIR)/mainboard.c) ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y) @@ -194,7 +217,7 @@ bootblock_lds = $(src)/arch/armv7/bootblock.lds bootblock_lds += $(chipset_bootblock_lds) bootblock_inc += $(src)/arch/armv7/bootblock.inc -bootblock_inc += $(src)/arch/armv7/lib/id.inc +bootblock_inc += $(src)/arch/armv7/id.inc bootblock_inc += $(chipset_bootblock_inc) bootblock_inc += $(objgenerated)/bootblock.inc diff --git a/src/arch/armv7/boot/boot.c b/src/arch/armv7/boot.c index ab531be868..ab531be868 100644 --- a/src/arch/armv7/boot/boot.c +++ b/src/arch/armv7/boot.c diff --git a/src/arch/armv7/boot/Makefile.inc b/src/arch/armv7/boot/Makefile.inc deleted file mode 100644 index 8d24fae10e..0000000000 --- a/src/arch/armv7/boot/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -ramstage-y += boot.c -#ramstage-$(CONFIG_MULTIBOOT) += multiboot.c -ramstage-y += tables.c -#ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c -#ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.c -#ramstage-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.S - -#FIXME(dhendrix): is there anything preventing multiboot from -#working on ARM? - -$(obj)/arch/armv7/boot/coreboot_table.ramstage.o : $(OPTION_TABLE_H) -#$(obj)/arch/x86/boot/smbios.ramstage.o: $(obj)/build.h diff --git a/src/arch/armv7/lib/cache.c b/src/arch/armv7/cache.c index 04eaa88c7c..04eaa88c7c 100644 --- a/src/arch/armv7/lib/cache.c +++ b/src/arch/armv7/cache.c diff --git a/src/arch/armv7/lib/div0.c b/src/arch/armv7/div0.c index ab06ad3bee..ab06ad3bee 100644 --- a/src/arch/armv7/lib/div0.c +++ b/src/arch/armv7/div0.c diff --git a/src/arch/armv7/lib/eabi_compat.c b/src/arch/armv7/eabi_compat.c index c063c85dd8..c063c85dd8 100644 --- a/src/arch/armv7/lib/eabi_compat.c +++ b/src/arch/armv7/eabi_compat.c diff --git a/src/arch/armv7/lib/early_console.c b/src/arch/armv7/early_console.c index 68e81c632e..68e81c632e 100644 --- a/src/arch/armv7/lib/early_console.c +++ b/src/arch/armv7/early_console.c diff --git a/src/arch/armv7/lib/id.inc b/src/arch/armv7/id.inc index ffe547d748..ffe547d748 100644 --- a/src/arch/armv7/lib/id.inc +++ b/src/arch/armv7/id.inc diff --git a/src/arch/armv7/lib/interrupts.c b/src/arch/armv7/interrupts.c index 7508c69214..7508c69214 100644 --- a/src/arch/armv7/lib/interrupts.c +++ b/src/arch/armv7/interrupts.c diff --git a/src/arch/armv7/lib/Makefile.inc b/src/arch/armv7/lib/Makefile.inc deleted file mode 100644 index b10c1abc76..0000000000 --- a/src/arch/armv7/lib/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -#FIXME: cache_v7 and cache-cp15 will go away eventually - -bootblock-$(CONFIG_EARLY_CONSOLE) += early_console.c -bootblock-y += cache.c - -romstage-y += cache.c -romstage-y += div0.c -romstage-$(CONFIG_EARLY_CONSOLE) += early_console.c - -ramstage-y += div0.c -#ramstage-y += interrupts.c -#ramstage-y += memcpy.S -#ramstage-y += memset.S -ramstage-y += cache.c -ramstage-y += mmu.c - -#FIXME(dhendrix): should this be a config option? -romstage-y += eabi_compat.c -ramstage-y += eabi_compat.c -bootblock-y += eabi_compat.c diff --git a/src/arch/armv7/lib/memcpy.S b/src/arch/armv7/memcpy.S index f04113f279..f04113f279 100644 --- a/src/arch/armv7/lib/memcpy.S +++ b/src/arch/armv7/memcpy.S diff --git a/src/arch/armv7/lib/memset.S b/src/arch/armv7/memset.S index 3ea2721227..3ea2721227 100644 --- a/src/arch/armv7/lib/memset.S +++ b/src/arch/armv7/memset.S diff --git a/src/arch/armv7/lib/mmu.c b/src/arch/armv7/mmu.c index 7d6d46a8a1..7d6d46a8a1 100644 --- a/src/arch/armv7/lib/mmu.c +++ b/src/arch/armv7/mmu.c diff --git a/src/arch/armv7/boot/tables.c b/src/arch/armv7/tables.c index 0fc7399c13..0fc7399c13 100644 --- a/src/arch/armv7/boot/tables.c +++ b/src/arch/armv7/tables.c |