From 93ce3b3a28dc0aad0bb501072bc7fc31e9cd6ce2 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 24 May 2013 14:38:48 -0700 Subject: [PATCH] ARMv7: flatten arch/armv7 source tree With only 19 source files it doesn't make a whole lot of sense to create sub directories in arch/armv7, especially since the files were distributed somewhat randomly. Change-Id: I029c7848e915edf1737e1c401c034837c95d179d Signed-off-by: Stefan Reinauer Signed-off-by: Gabe Black Reviewed-on: http://review.coreboot.org/3659 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/armv7/Makefile.inc | 25 +++++++++++++++++++++++- src/arch/armv7/{boot => }/boot.c | 0 src/arch/armv7/boot/Makefile.inc | 12 ------------ src/arch/armv7/{lib => }/cache.c | 0 src/arch/armv7/{lib => }/div0.c | 0 src/arch/armv7/{lib => }/eabi_compat.c | 0 src/arch/armv7/{lib => }/early_console.c | 0 src/arch/armv7/{lib => }/id.inc | 0 src/arch/armv7/{lib => }/interrupts.c | 0 src/arch/armv7/lib/Makefile.inc | 20 ------------------- src/arch/armv7/{lib => }/memcpy.S | 0 src/arch/armv7/{lib => }/memset.S | 0 src/arch/armv7/{lib => }/mmu.c | 0 src/arch/armv7/{boot => }/tables.c | 0 14 files changed, 24 insertions(+), 33 deletions(-) rename src/arch/armv7/{boot => }/boot.c (100%) delete mode 100644 src/arch/armv7/boot/Makefile.inc rename src/arch/armv7/{lib => }/cache.c (100%) rename src/arch/armv7/{lib => }/div0.c (100%) rename src/arch/armv7/{lib => }/eabi_compat.c (100%) rename src/arch/armv7/{lib => }/early_console.c (100%) rename src/arch/armv7/{lib => }/id.inc (100%) rename src/arch/armv7/{lib => }/interrupts.c (100%) delete mode 100644 src/arch/armv7/lib/Makefile.inc rename src/arch/armv7/{lib => }/memcpy.S (100%) rename src/arch/armv7/{lib => }/memset.S (100%) rename src/arch/armv7/{lib => }/mmu.c (100%) rename src/arch/armv7/{boot => }/tables.c (100%) 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 similarity index 100% rename from src/arch/armv7/boot/boot.c rename to 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 similarity index 100% rename from src/arch/armv7/lib/cache.c rename to src/arch/armv7/cache.c diff --git a/src/arch/armv7/lib/div0.c b/src/arch/armv7/div0.c similarity index 100% rename from src/arch/armv7/lib/div0.c rename to src/arch/armv7/div0.c diff --git a/src/arch/armv7/lib/eabi_compat.c b/src/arch/armv7/eabi_compat.c similarity index 100% rename from src/arch/armv7/lib/eabi_compat.c rename to src/arch/armv7/eabi_compat.c diff --git a/src/arch/armv7/lib/early_console.c b/src/arch/armv7/early_console.c similarity index 100% rename from src/arch/armv7/lib/early_console.c rename to src/arch/armv7/early_console.c diff --git a/src/arch/armv7/lib/id.inc b/src/arch/armv7/id.inc similarity index 100% rename from src/arch/armv7/lib/id.inc rename to src/arch/armv7/id.inc diff --git a/src/arch/armv7/lib/interrupts.c b/src/arch/armv7/interrupts.c similarity index 100% rename from src/arch/armv7/lib/interrupts.c rename to 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 similarity index 100% rename from src/arch/armv7/lib/memcpy.S rename to src/arch/armv7/memcpy.S diff --git a/src/arch/armv7/lib/memset.S b/src/arch/armv7/memset.S similarity index 100% rename from src/arch/armv7/lib/memset.S rename to src/arch/armv7/memset.S diff --git a/src/arch/armv7/lib/mmu.c b/src/arch/armv7/mmu.c similarity index 100% rename from src/arch/armv7/lib/mmu.c rename to src/arch/armv7/mmu.c diff --git a/src/arch/armv7/boot/tables.c b/src/arch/armv7/tables.c similarity index 100% rename from src/arch/armv7/boot/tables.c rename to src/arch/armv7/tables.c