aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2014-10-15 18:19:03 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2015-04-09 00:27:51 +0200
commit771819a3806b5e60e3db73b2779072ee0f23890f (patch)
tree6ea3278450296881e124e8e61841e56bcab6c143
parent3df01265d506f1a3f7fd30bb6f19f10724fcc393 (diff)
cosmos: rearrange configuration and makefile definitions
This is a no-op aesthetic change, arranging configurarion and makefile lines alphanumerically. BRANCH=none BUG=none TEST=cosmos still builds Change-Id: I72b7defca722380dda3ef8453e625f28bdebfa2c Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: c55a7e9d5064edf5cac9498c8c6c377cbf705bb1 Original-Change-Id: I4498eef59fc20ea04b6ebadb451d0fe346824c05 Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/223597 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9353 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/soc/marvell/bg4cd/Kconfig14
-rw-r--r--src/soc/marvell/bg4cd/Makefile.inc10
2 files changed, 12 insertions, 12 deletions
diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig
index 0a9778d7ad..f8bf0b9fcd 100644
--- a/src/soc/marvell/bg4cd/Kconfig
+++ b/src/soc/marvell/bg4cd/Kconfig
@@ -20,16 +20,16 @@
config SOC_MARVELL_BG4CD
bool
default n
- select CPU_HAS_BOOTBLOCK_INIT
- select HAVE_MONOTONIC_TIMER
- select GENERIC_UDELAY
- select EARLY_CONSOLE
- select DYNAMIC_CBMEM
select ARCH_BOOTBLOCK_ARMV7
- select ARCH_VERSTAGE_ARMV7
- select ARCH_ROMSTAGE_ARMV7
select ARCH_RAMSTAGE_ARMV7
+ select ARCH_ROMSTAGE_ARMV7
+ select ARCH_VERSTAGE_ARMV7
select BOOTBLOCK_CONSOLE
+ select CPU_HAS_BOOTBLOCK_INIT
+ select DYNAMIC_CBMEM
+ select EARLY_CONSOLE
+ select GENERIC_UDELAY
+ select HAVE_MONOTONIC_TIMER
if SOC_MARVELL_BG4CD
diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc
index 7d114dd6f6..7d49486254 100644
--- a/src/soc/marvell/bg4cd/Makefile.inc
+++ b/src/soc/marvell/bg4cd/Makefile.inc
@@ -18,24 +18,24 @@
##
bootblock-y += cbmem.c
-bootblock-y += monotonic_timer.c
-bootblock-y += media.c
bootblock-y += i2c.c
+bootblock-y += media.c
+bootblock-y += monotonic_timer.c
-verstage-y += monotonic_timer.c
verstage-y += i2c.c
verstage-y += media.c
+verstage-y += monotonic_timer.c
romstage-y += cbmem.c
-romstage-y += monotonic_timer.c
romstage-y += i2c.c
romstage-y += media.c
+romstage-y += monotonic_timer.c
romstage-y += sdram.c
ramstage-y += cbmem.c
-ramstage-y += monotonic_timer.c
ramstage-y += i2c.c
ramstage-y += media.c
+ramstage-y += monotonic_timer.c
$(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
cp $< $@