From 4656ce26f02addf2f8ae030d388f59dca47ce595 Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Wed, 21 Nov 2018 20:24:51 +1300 Subject: [PATCH] configs: Remove CONFIG_MARVELL This option is defined by a few boards but doesn't guard any code. Remove it from the boards and config_whitelist.txt. Signed-off-by: Chris Packham Reviewed-by: Stefan Roese --- include/configs/edminiv2.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/mv-common.h | 1 - scripts/config_whitelist.txt | 1 - 4 files changed, 4 deletions(-) diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 89aa11c0ed..645fc3ffb8 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -29,7 +29,6 @@ * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 #define CONFIG_FEROCEON 1 /* CPU Core subversion */ #define CONFIG_88F5182 1 /* SOC Name */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index e2585171af..0de83f6723 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -22,7 +22,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 5eeb5a1624..a803093163 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -19,7 +19,6 @@ /* * High Level Configuration Options (easy to change) */ -#define CONFIG_MARVELL 1 /* * Custom CONFIG_SYS_TEXT_BASE can be done in .h diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7dd9d60541..69bef5e6da 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1199,7 +1199,6 @@ CONFIG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MARCO_MEMSET CONFIG_MARUBUN_PCCARD -CONFIG_MARVELL CONFIG_MARVELL_GPIO CONFIG_MARVELL_MFP CONFIG_MASK_AER_AO -- 2.39.5