diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-30 09:44:52 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-10-30 09:44:52 +0100 |
| commit | 104aecadc34ec12d14bad0ad71d2b88c59ae9dd8 (patch) | |
| tree | 2c6c944420d7e5518f9246fe01a838261aeae34d /board | |
| parent | 604c39da346537ac1168fdcde1dcfb12506b5416 (diff) | |
| parent | b39a120de590a04a6bb7f04cb4cffa5f6aed715e (diff) | |
Merge branch 'chromeos-v2011.06' into colibri
Conflicts:
arch/arm/cpu/armv7/tegra3/warmboot_avp.c
arch/arm/include/asm/arch-tegra/clk_rst.h
Diffstat (limited to 'board')
| -rw-r--r-- | board/chromebook-x86/coreboot/config.mk | 3 | ||||
| -rw-r--r-- | board/nvidia/seaboard/chromeos.dtsi | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/board/chromebook-x86/coreboot/config.mk b/board/chromebook-x86/coreboot/config.mk index 857ee8c4b9..627d4cfaf2 100644 --- a/board/chromebook-x86/coreboot/config.mk +++ b/board/chromebook-x86/coreboot/config.mk @@ -36,3 +36,6 @@ HOSTCFLAGS_autoconf.mk.dep = -Wno-variadic-macros LD := $(LD).bfd +ifdef BUILD_FACTORY_IMAGE +PLATFORM_CPPFLAGS += -DFACTORY_IMAGE +endif diff --git a/board/nvidia/seaboard/chromeos.dtsi b/board/nvidia/seaboard/chromeos.dtsi index 0088121556..438af87824 100644 --- a/board/nvidia/seaboard/chromeos.dtsi +++ b/board/nvidia/seaboard/chromeos.dtsi @@ -12,7 +12,7 @@ chromeos-config { twostop; /* Two-stop boot */ twostop-optional; /* One-stop optimization enabled */ - textbase = <0xe08000>; /* Address where U-Boot loads */ + textbase = <0x108000>; /* Address where U-Boot loads */ /* * Device and offset for second-stage firmware, in SPI for now |