diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-rmobile/Kconfig.32 index 84c1a6d07bd6ad77e0e0bc17dd3b4419c6200bc3..1ceb329f1f716a8ee4ccfc66a9303d50fc2163c6 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-rmobile/Kconfig.32 @@ -1,5 +1,9 @@ if RCAR_32 +config ARCH_RMOBILE_BOARD_STRING + string "Renesas RCar Gen2 board name" + default "Board" + config RCAR_GEN2 bool "Renesas RCar Gen2" diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 82499615c75661bd63503aa945fa78c0cd36c6b2..b0b864c1a19ce9499baaaf4742d459c04383f2e9 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Alt" CONFIG_R8A7794=y CONFIG_TARGET_ALT=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig index 2c212e297bcbd9182a329a342b40b9254341de79..753077b67669cf6277e6420c79f2c1064b3e27c0 100644 --- a/configs/armadillo-800eva_defconfig +++ b/configs/armadillo-800eva_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0xE80C0000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Armadillo-800EVA Board" CONFIG_R8A7740=y CONFIG_TARGET_ARMADILLO_800EVA=y CONFIG_BOOTDELAY=3 diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index d9c08e1a4bf0179eb8e1e06c0ab8ef68924c7f9a..bd5fccac93d4bab1a18881649986bf32694b7399 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Blanche" CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche-u-boot" diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 3c6a4bd41ba74bc5cc56d81bad2d619750dcd6bb..8479887604739b8dbe5fdf219cbeda2a484ab517 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Gose" CONFIG_R8A7793=y CONFIG_TARGET_GOSE=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index f1826663560a3a1d982235833c46776911cb483a..faca596115939fe0d40d0ced51b1553bf4761bcf 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Koelsch" CONFIG_R8A7791=y CONFIG_TARGET_KOELSCH=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig index f34fe9be189ed32681497e84a42f4f81dbf3ca42..af931855b7c41ae9fb548259449d52ecea93a9af 100644 --- a/configs/kzm9g_defconfig +++ b/configs/kzm9g_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_RMOBILE=y CONFIG_SYS_TEXT_BASE=0x00000000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="KMC KZM-A9-GT" CONFIG_TARGET_KZM9G=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index 1071da24d219c296fc7351d0ea3e7609ef1b44a0..901b34e1dd55ebbcd9629b60dc89b316424328eb 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Lager" CONFIG_R8A7790=y CONFIG_TARGET_LAGER=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index 64b064d1a8fbc4ff5d90148e964ccf05d37495cc..b04627efa3df6eb7de25b010390a624ac3b82c30 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Porter" CONFIG_R8A7791=y CONFIG_TARGET_PORTER=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 4cb1179a68152367e73521c3a66694af2b5bb708..c163e823b5b03e577e8b7bc8c5647c3235d0dccf 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Silk" CONFIG_R8A7794=y CONFIG_TARGET_SILK=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 4f5ebfa091ffcec43034e7c463efd6c8c1352af7..d940932bafd3fc090b551f42adaf54c2a199a437 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x50000000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SYS_MALLOC_F_LEN=0x8000 +CONFIG_ARCH_RMOBILE_BOARD_STRING="Stout" CONFIG_R8A7790=y CONFIG_TARGET_STOUT=y CONFIG_SPL_SERIAL_SUPPORT=y diff --git a/include/configs/alt.h b/include/configs/alt.h index 46d7ba9a18310854880fef369e901d8514aba865..51799bf423419cd72103ce7af586b1b7d8a72595 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -11,7 +11,6 @@ #define __ALT_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt" #include "rcar-gen2-common.h" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 6e7ac0a905597bb2f71d5366438a2dc60588ea10..826211a5270c97f716d895ce99579d2283b177fc 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -10,7 +10,6 @@ #define __ARMADILLO_800EVA_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n" #define CONFIG_SH_GPIO_PFC #include <asm/arch/rmobile.h> diff --git a/include/configs/blanche.h b/include/configs/blanche.h index c8af6e9fa2cc6e846ac9c0eb72a8bf10143cc52b..e4e61ec2a3ef3d914677db0aff29b0442ec4a134 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -11,7 +11,6 @@ #define __BLANCHE_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Blanche" #include "rcar-gen2-common.h" diff --git a/include/configs/gose.h b/include/configs/gose.h index 1f814bfe7ab3bb6325900c3998a1665b83a3372b..5b3dce87e23b5c39b46de380fcd7606c0daa3bf8 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -10,7 +10,6 @@ #define __GOSE_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose" #include "rcar-gen2-common.h" diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index ec2162cb80384e79294eb5456c33e5f62c410600..2571aec550ecfe02d1989b9fd7496cddf44efd25 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -10,7 +10,6 @@ #define __KOELSCH_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch" #include "rcar-gen2-common.h" diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 179c7603f266ef1cbde628d7bf5a7ce122780922..4781da71af335f0a22c8ea6a7b25a3fb632a2017 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_SH73A0 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT" #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G #include <asm/arch/rmobile.h> diff --git a/include/configs/lager.h b/include/configs/lager.h index 0d9272cfa310d0b5c8486c5ed4ff531dbca59389..4d45d50ac4378b0632b35548433456dc42e0a90c 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -11,7 +11,6 @@ #define __LAGER_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager" #include "rcar-gen2-common.h" diff --git a/include/configs/porter.h b/include/configs/porter.h index ba444762f156faab0f1478d774ca1411e424d487..b4aeb54ef067b3df319c204ecd2fe0e9d5f01d0d 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -12,7 +12,6 @@ #define __PORTER_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter" #include "rcar-gen2-common.h" diff --git a/include/configs/silk.h b/include/configs/silk.h index 465291fffdf3c4f161960de8e1186c34721bf2fc..afc7faf66cd85b0ab6215d38f0913db9987220d2 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -12,7 +12,6 @@ #define __SILK_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk" #include "rcar-gen2-common.h" diff --git a/include/configs/stout.h b/include/configs/stout.h index 22e23eb1821fcd87a42f39d45bf0451f7ad0c749..1a1a3eb88324e826e6fbc7be92ea795ee43f8f0b 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -13,7 +13,6 @@ #define __STOUT_H #undef DEBUG -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout" #include "rcar-gen2-common.h" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cf95a29533d4626b95272607ba5d721ce00f16b7..bdbfcbeb70c1b6e24f5492be9202615f11c9b78d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -43,7 +43,6 @@ CONFIG_ARCH_KIRKWOOD CONFIG_ARCH_MAP_SYSMEM CONFIG_ARCH_OMAP4 CONFIG_ARCH_ORION5X -CONFIG_ARCH_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_TEGRA CONFIG_ARCH_USE_BUILTIN_BSWAP