[U-Boot] [PATCH 1/7] powerpc: mpc512x: fix boot breakage

Commit d6b11fd1 (powerpc: remove MBX and MBX860T boards support) removed mbxbar field in "struct sysconf512x" by mistake and broke booting on mpc5121 boards. Fix it.
Signed-off-by: Anatolij Gustschin agust@denx.de --- NOTE: ALL mpc512x boards are broken in releases v2014.07 and v2014.10.
arch/powerpc/include/asm/immap_512x.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/arch/powerpc/include/asm/immap_512x.h b/arch/powerpc/include/asm/immap_512x.h index 6086a73..bed80aa 100644 --- a/arch/powerpc/include/asm/immap_512x.h +++ b/arch/powerpc/include/asm/immap_512x.h @@ -59,6 +59,7 @@ typedef struct sysconf512x { u8 res2[0x28]; law512x_t ddrlaw; /* DDR Local Access Window */ u8 res3[0x18]; + u32 mbxbar; /* MBX Base Address */ u32 srambar; /* SRAM Base Address */ u32 nfcbar; /* NFC Base Address */ u8 res4[0x34];

Also enable CONFIG_DISPLAY_BOARDINFO to get checkboard() called.
Signed-off-by: Anatolij Gustschin agust@denx.de --- include/configs/mpc5121ads.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 7de245b..41ae0a5 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -12,6 +12,9 @@ #define __CONFIG_H
#define CONFIG_MPC5121ADS 1 +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD + /* * Memory map for the MPC5121ADS board: *

Dear Anatolij Gustschin,
In message 1413892024-2760-2-git-send-email-agust@denx.de you wrote:
Also enable CONFIG_DISPLAY_BOARDINFO to get checkboard() called.
Signed-off-by: Anatolij Gustschin agust@denx.de
include/configs/mpc5121ads.h | 3 +++ 1 file changed, 3 insertions(+)
Applied to u-boot-mpc5xxx, thanks.
Viele Grüße,
Wolfgang Denk

Signed-off-by: Anatolij Gustschin agust@denx.de --- include/configs/pdm360ng.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 553eb8f..17d7bca 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -13,6 +13,8 @@ #define __CONFIG_H
#define CONFIG_PDM360NG 1 +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD
/* * Memory map for the PDM360NG board:

Dear Anatolij Gustschin,
In message 1413892024-2760-3-git-send-email-agust@denx.de you wrote:
Signed-off-by: Anatolij Gustschin agust@denx.de
include/configs/pdm360ng.h | 2 ++ 1 file changed, 2 insertions(+)
Applied to u-boot-mpc5xxx, thanks.
Best regards,
Wolfgang Denk

Signed-off-by: Anatolij Gustschin agust@denx.de --- include/configs/aria.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/aria.h b/include/configs/aria.h index c36cf33..2f9677c 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -13,6 +13,9 @@ #define __CONFIG_H
#define CONFIG_ARIA 1 +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD + /* * Memory map for the ARIA board: *

Dear Anatolij Gustschin,
In message 1413892024-2760-4-git-send-email-agust@denx.de you wrote:
Signed-off-by: Anatolij Gustschin agust@denx.de
include/configs/aria.h | 3 +++ 1 file changed, 3 insertions(+)
Applied to u-boot-mpc5xxx, thanks.
Best regards,
Wolfgang Denk

Signed-off-by: Anatolij Gustschin agust@denx.de --- include/configs/ac14xx.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index f57820d..54b7028 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -13,6 +13,9 @@ #define __CONFIG_H
#define CONFIG_AC14XX 1 +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD + /* * Memory map for the ifm AC14xx board: *

Dear Anatolij Gustschin,
In message 1413892024-2760-5-git-send-email-agust@denx.de you wrote:
Signed-off-by: Anatolij Gustschin agust@denx.de
include/configs/ac14xx.h | 3 +++ 1 file changed, 3 insertions(+)
Applied to u-boot-mpc5xxx, thanks.
Best regards,
Wolfgang Denk

Signed-off-by: Anatolij Gustschin agust@denx.de Cc: Reinhard Arlt reinhard.arlt@esd-electronics.com --- include/configs/mecp5123.h | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index 6c19817..0b9cbae 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -15,6 +15,9 @@ #define __CONFIG_H
#define CONFIG_MECP5123 1 +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD + /* * Memory map for the MECP5123 board: *

Dear Anatolij Gustschin,
In message 1413892024-2760-6-git-send-email-agust@denx.de you wrote:
Signed-off-by: Anatolij Gustschin agust@denx.de Cc: Reinhard Arlt reinhard.arlt@esd-electronics.com
include/configs/mecp5123.h | 3 +++ 1 file changed, 3 insertions(+)
Applied to u-boot-mpc5xxx, thanks.
Best regards,
Wolfgang Denk

Signed-off-by: Anatolij Gustschin agust@denx.de --- include/configs/digsy_mtc.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index 2a8cb39..76ec168 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -22,6 +22,8 @@
#define CONFIG_MPC5200 1 /* This is an MPC5200 CPU */ #define CONFIG_DIGSY_MTC 1 /* ... on InterControl digsyMTC board */ +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD
/* * Valid values for CONFIG_SYS_TEXT_BASE are:

Dear Anatolij Gustschin,
In message 1413892024-2760-7-git-send-email-agust@denx.de you wrote:
Signed-off-by: Anatolij Gustschin agust@denx.de
include/configs/digsy_mtc.h | 2 ++ 1 file changed, 2 insertions(+)
Applied to u-boot-mpc5xxx, thanks.
Best regards,
Wolfgang Denk

Dear Anatolij Gustschin,
In message 1413892024-2760-1-git-send-email-agust@denx.de you wrote:
Commit d6b11fd1 (powerpc: remove MBX and MBX860T boards support) removed mbxbar field in "struct sysconf512x" by mistake and broke booting on mpc5121 boards. Fix it.
Signed-off-by: Anatolij Gustschin agust@denx.de
NOTE: ALL mpc512x boards are broken in releases v2014.07 and v2014.10.
Applied to u-boot-mpc5xxx, thanks.
Best regards,
Wolfgang Denk
participants (2)
-
Anatolij Gustschin
-
Wolfgang Denk