From 3ce88cd7e157c2ce68112c7d4ae85ee2bf4c87cf Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 2 May 2018 11:41:17 +0200 Subject: ARM: rmobile: Fix CONFIG_RMOBILE_BOARD_STRING Rename CONFIG_RMOBILE_BOARD_STRING to CONFIG_ARCH_RMOBILE_BOARD_STRING to make things consistent, no functional change. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- include/configs/blanche.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/blanche.h b/include/configs/blanche.h index ae3213f959..c8af6e9fa2 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -11,7 +11,7 @@ #define __BLANCHE_H #undef DEBUG -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" +#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Blanche" #include "rcar-gen2-common.h" -- cgit From 83a64bebe4204d57f6f024f9a31f364c13f4b93e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 2 May 2018 11:42:22 +0200 Subject: ARM: rmobile: Convert CONFIG_ARCH_RMOBILE_BOARD_STRING to Kconfig Convert the symbol to Kconfig, no functional change. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - 10 files changed, 10 deletions(-) (limited to 'include') diff --git a/include/configs/alt.h b/include/configs/alt.h index 46d7ba9a18..51799bf423 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 6e7ac0a905..826211a527 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 diff --git a/include/configs/blanche.h b/include/configs/blanche.h index c8af6e9fa2..e4e61ec2a3 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 1f814bfe7a..5b3dce87e2 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 ec2162cb80..2571aec550 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 179c7603f2..4781da71af 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 diff --git a/include/configs/lager.h b/include/configs/lager.h index 0d9272cfa3..4d45d50ac4 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 ba444762f1..b4aeb54ef0 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 465291fffd..afc7faf66c 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 22e23eb182..1a1a3eb883 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" -- cgit From 74c8cb02a4a7d20961a58ff8763ee32045becccb Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 2 May 2018 11:55:56 +0200 Subject: ARM: rmobile: Zap #undef DEBUG The DEBUG macro is never defined unless explicitly enabled. Drop useless #undef DEBUG in the board configs so it won't spread any further. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu --- include/configs/alt.h | 2 -- include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 2 -- include/configs/draak.h | 2 -- include/configs/eagle.h | 2 -- include/configs/gose.h | 2 -- include/configs/koelsch.h | 2 -- include/configs/kzm9g.h | 2 -- include/configs/lager.h | 2 -- include/configs/porter.h | 2 -- include/configs/salvator-x.h | 2 -- include/configs/silk.h | 2 -- include/configs/stout.h | 2 -- include/configs/ulcb.h | 2 -- 14 files changed, 27 deletions(-) (limited to 'include') diff --git a/include/configs/alt.h b/include/configs/alt.h index 51799bf423..ba0b2fd671 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -10,8 +10,6 @@ #ifndef __ALT_H #define __ALT_H -#undef DEBUG - #include "rcar-gen2-common.h" #define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 826211a527..b49407a8b2 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -9,7 +9,6 @@ #ifndef __ARMADILLO_800EVA_H #define __ARMADILLO_800EVA_H -#undef DEBUG #define CONFIG_SH_GPIO_PFC #include diff --git a/include/configs/blanche.h b/include/configs/blanche.h index e4e61ec2a3..a978f728c9 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -10,8 +10,6 @@ #ifndef __BLANCHE_H #define __BLANCHE_H -#undef DEBUG - #include "rcar-gen2-common.h" /* STACK */ diff --git a/include/configs/draak.h b/include/configs/draak.h index fef5e2e011..a5c2210cc9 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -10,8 +10,6 @@ #ifndef __DRAAK_H #define __DRAAK_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ diff --git a/include/configs/eagle.h b/include/configs/eagle.h index d2d46f0425..b570ef9115 100644 --- a/include/configs/eagle.h +++ b/include/configs/eagle.h @@ -10,8 +10,6 @@ #ifndef __EAGLE_H #define __EAGLE_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ diff --git a/include/configs/gose.h b/include/configs/gose.h index 5b3dce87e2..3c5c00ae6b 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -9,8 +9,6 @@ #ifndef __GOSE_H #define __GOSE_H -#undef DEBUG - #include "rcar-gen2-common.h" #define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 2571aec550..41cab6d0ef 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -9,8 +9,6 @@ #ifndef __KOELSCH_H #define __KOELSCH_H -#undef DEBUG - #include "rcar-gen2-common.h" #define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 4781da71af..dc05db1baf 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -8,8 +8,6 @@ #ifndef __KZM9G_H #define __KZM9G_H -#undef DEBUG - #define CONFIG_SH73A0 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G diff --git a/include/configs/lager.h b/include/configs/lager.h index 4d45d50ac4..d5d76c2404 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -10,8 +10,6 @@ #ifndef __LAGER_H #define __LAGER_H -#undef DEBUG - #include "rcar-gen2-common.h" #define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 diff --git a/include/configs/porter.h b/include/configs/porter.h index b4aeb54ef0..491adcdde1 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -11,8 +11,6 @@ #ifndef __PORTER_H #define __PORTER_H -#undef DEBUG - #include "rcar-gen2-common.h" #define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 33624e6c4e..89e1b20c29 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -10,8 +10,6 @@ #ifndef __SALVATOR_X_H #define __SALVATOR_X_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ diff --git a/include/configs/silk.h b/include/configs/silk.h index afc7faf66c..8eac7b8c9b 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -11,8 +11,6 @@ #ifndef __SILK_H #define __SILK_H -#undef DEBUG - #include "rcar-gen2-common.h" #define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 diff --git a/include/configs/stout.h b/include/configs/stout.h index 1a1a3eb883..ceed06f13e 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -12,8 +12,6 @@ #ifndef __STOUT_H #define __STOUT_H -#undef DEBUG - #include "rcar-gen2-common.h" #define CONFIG_SYS_INIT_SP_ADDR 0x4f000000 diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index dfd6436b3c..4d76fd69e5 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -10,8 +10,6 @@ #ifndef __ULCB_H #define __ULCB_H -#undef DEBUG - #include "rcar-gen3-common.h" /* Ethernet RAVB */ -- cgit