diff options
| author | Tom Rini <trini@ti.com> | 2014-11-19 23:17:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-19 23:17:13 -0500 |
| commit | f10834e166467ce153ec985421b9deb8d292410d (patch) | |
| tree | 00f0ec82bde348f674a90e67793fb343276206cd | |
| parent | 50dcf89d90b3597d86f5d26f131eabc98bbd5209 (diff) | |
| parent | 5fc3494fdb00dd7894090ce0c21936815a575558 (diff) | |
| download | blackbird-obmc-uboot-f10834e166467ce153ec985421b9deb8d292410d.tar.gz blackbird-obmc-uboot-f10834e166467ce153ec985421b9deb8d292410d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
| -rw-r--r-- | arch/powerpc/cpu/mpc5xxx/start.S | 15 | ||||
| -rw-r--r-- | include/configs/a3m071.h | 2 | ||||
| -rw-r--r-- | include/configs/a4m072.h | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/arch/powerpc/cpu/mpc5xxx/start.S b/arch/powerpc/cpu/mpc5xxx/start.S index 02c706ec63..94eb0d3fff 100644 --- a/arch/powerpc/cpu/mpc5xxx/start.S +++ b/arch/powerpc/cpu/mpc5xxx/start.S @@ -76,6 +76,21 @@ _start: * been done in the SPL u-boot version. */ GET_GOT /* initialize GOT access */ + + /* + * The GD (global data) struct needs to get cleared. Lets do + * this by calling memset(). + * This function is called when the platform is build with SPL + * support from the main (full-blown) U-Boot. And the GD needs + * to get cleared (again) so that the following generic + * board support code, defined via CONFIG_SYS_GENERIC_BOARD, + * initializes all variables correctly. + */ + mr r3, r2 /* parameter 1: GD pointer */ + li r4,0 /* parameter 2: value to fill */ + li r5,GD_SIZE /* parameter 3: count */ + bl memset + bl board_init_f /* run 1st part of board init code (in Flash)*/ /* NOTREACHED - board_init_f() does not return */ #else diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h index a4050f34cc..120fdc6659 100644 --- a/include/configs/a3m071.h +++ b/include/configs/a3m071.h @@ -14,6 +14,8 @@ #define CONFIG_MPC5200 #define CONFIG_A3M071 /* A3M071 board */ +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_TEXT_BASE 0x01000000 /* boot low for 32 MiB boards */ diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index cc88ac1618..3c6765560e 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -19,6 +19,8 @@ #define CONFIG_MPC5200 1 /* This is a MPC5200 CPU */ #define CONFIG_A4M072 1 /* ... on A4M072 board */ #define CONFIG_MPC5200_DDR 1 /* ... use DDR RAM */ +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_TEXT_BASE 0xFE000000 |
