diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-04 23:21:12 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-09-04 23:21:12 +0200 |
| commit | 6342fa00b20fa01e93c8c6886376ea27ee9a7a73 (patch) | |
| tree | 176dd71f8a1c8d285c488659944961993dc2aff3 /include | |
| parent | e62b008fe341030f4a80a09b66952bba65027b70 (diff) | |
| parent | 7d899c14cc1842004e5f94a376082e7b6cf5988d (diff) | |
| download | u-boot-imx-6342fa00b20fa01e93c8c6886376ea27ee9a7a73.zip u-boot-imx-6342fa00b20fa01e93c8c6886376ea27ee9a7a73.tar.gz u-boot-imx-6342fa00b20fa01e93c8c6886376ea27ee9a7a73.tar.bz2 | |
Merge remote-tracking branch 'u-boot-atmel/master' into m
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/eb_cpux9k2.h | 7 | ||||
| -rw-r--r-- | include/configs/stamp9g20.h | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index d4104de..9371ec3 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -44,7 +44,12 @@ #define MACH_TYPE_EB_CPUX9K2 1977 #define CONFIG_MACH_TYPE MACH_TYPE_EB_CPUX9K2 /*--------------------------------------------------------------------------*/ -#define CONFIG_SYS_TEXT_BASE 0x00000000 +#ifndef CONFIG_RAMBOOT +#define CONFIG_SYS_TEXT_BASE 0x00000000 +#else +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SYS_TEXT_BASE 0x21f00000 +#endif #define CONFIG_SYS_LOAD_ADDR 0x21000000 /* default load address */ #define CONFIG_SYS_BOOT_SIZE 0x00 /* 0 KBytes */ diff --git a/include/configs/stamp9g20.h b/include/configs/stamp9g20.h index a2a0156..a881eef 100644 --- a/include/configs/stamp9g20.h +++ b/include/configs/stamp9g20.h @@ -59,6 +59,7 @@ #define CONFIG_INITRD_TAG /* pass initrd param to kernel */ #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */ #define CONFIG_BOARD_EARLY_INIT_f /* call board_early_init_f() */ +#define CONFIG_BOARD_POSTCLK_INIT /* call board_postclk_init() */ #define CONFIG_DISPLAY_CPUINFO /* display CPU Info at startup */ /* setting board specific options */ |