Convert CONFIG_MIP405T from SYS_EXTRA_OPTIONS to a real config
There are two boards, MIP405 and MIP405T that have a few differences.
Start by checking for CONFIG_TARGET_MIP405. Then introduce
CONFIG_TARGET_MIP405T and use that not CONFIG_MIP405T. Next, convert
also convert the usage of CONFIG_ISO_STRING to be based on Kconfig.
Signed-off-by: Tom Rini
---
arch/powerpc/cpu/ppc4xx/4xx_pci.c | 4 ++--
arch/powerpc/cpu/ppc4xx/Kconfig| 3 +++
arch/powerpc/cpu/ppc4xx/resetvec.S | 2 +-
board/mpl/common/common_util.c | 12 ++--
board/mpl/common/common_util.h | 2 +-
board/mpl/common/pci_parts.h | 4 ++--
board/mpl/mip405/Kconfig | 7 ++-
board/mpl/mip405/mip405.c | 14 +++---
board/mpl/pati/pati.h | 2 +-
configs/MIP405T_defconfig | 3 +--
include/configs/MIP405.h | 18 +++---
scripts/config_whitelist.txt | 2 --
12 files changed, 33 insertions(+), 40 deletions(-)
diff --git a/arch/powerpc/cpu/ppc4xx/4xx_pci.c
b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
index 30e6c65..314cfdc 100644
--- a/arch/powerpc/cpu/ppc4xx/4xx_pci.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_pci.c
@@ -118,7 +118,7 @@ void pci_405gp_init(struct pci_controller *hose)
#endif
unsigned long ptmla[2]= {CONFIG_SYS_PCI_PTM1LA,
CONFIG_SYS_PCI_PTM2LA};
unsigned long ptmms[2]= {CONFIG_SYS_PCI_PTM1MS,
CONFIG_SYS_PCI_PTM2MS};
-#if defined(CONFIG_PIP405) || defined (CONFIG_MIP405)
+#if defined(CONFIG_PIP405) || defined (CONFIG_TARGET_MIP405)
unsigned long pmmla[3]= {0x8000, 0xA000, 0};
unsigned long pmmma[3]= {0xE001, 0xE001, 0};
unsigned long pmmpcila[3] = {0x8000, 0x, 0};
@@ -408,7 +408,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose,
pci_dev_t dev,
pci_hose_write_config_dword(hose, dev, PCI_COMMAND, cmdstat);
}
-#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405))
+#if !(defined(CONFIG_PIP405) || defined (CONFIG_TARGET_MIP405))
/*
*As is these functs get called out of flash Not a horrible
diff --git a/arch/powerpc/cpu/ppc4xx/Kconfig b/arch/powerpc/cpu/ppc4xx/Kconfig
index 92a330d..a6066ef 100644
--- a/arch/powerpc/cpu/ppc4xx/Kconfig
+++ b/arch/powerpc/cpu/ppc4xx/Kconfig
@@ -104,6 +104,9 @@ config TARGET_ICON
config TARGET_MIP405
bool "Support MIP405"
+config TARGET_MIP405T
+ bool "Support MIP405T"
+
config TARGET_PIP405
bool "Support PIP405"
diff --git a/arch/powerpc/cpu/ppc4xx/resetvec.S
b/arch/powerpc/cpu/ppc4xx/resetvec.S
index b3308bd..4144837 100644
--- a/arch/powerpc/cpu/ppc4xx/resetvec.S
+++ b/arch/powerpc/cpu/ppc4xx/resetvec.S
@@ -4,7 +4,7 @@
#if defined(CONFIG_440)
b _start_440
#else
-#if defined(CONFIG_BOOT_PCI) && defined(CONFIG_MIP405)
+#if defined(CONFIG_BOOT_PCI) && defined(CONFIG_TARGET_MIP405)
b _start_pci
#else
b _start
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 2262175..c1a4b62 100644
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -20,7 +20,7 @@
#include "../pip405/pip405.h"
#include
#endif
-#ifdef CONFIG_MIP405
+#ifdef CONFIG_TARGET_MIP405
#include "../mip405/mip405.h"
#include
#endif
@@ -36,7 +36,7 @@ extern int mem_test(ulong start, ulong ramsize, int quiet);
#define I2C_BACKUP_ADDR 0x7C00 /* 0x200 bytes for backup */
#define IMAGE_SIZE CONFIG_SYS_MONITOR_LEN /* ugly, but it works for now */
-#if defined(CONFIG_PIP405) || defined(CONFIG_MIP405)
+#if defined(CONFIG_PIP405) || defined(CONFIG_TARGET_MIP405)
/*---
* On PIP/MIP405 we have 3 (4) possible boot mode
*
@@ -116,7 +116,7 @@ void setup_cs_reloc(void)
mtdcr(EBC0_CFGDATA, FLASH_CR_B);
}
}
-#endif /* #if defined(CONFIG_PIP405) || defined(CONFIG_MIP405) */
+#endif /* #if defined(CONFIG_PIP405) || defined(CONFIG_TARGET_MIP405) */
#ifdef CONFIG_SYS_UPDATE_FLASH_SIZE
/* adjust flash start and protection info */
@@ -190,12 +190,12 @@ mpl_prg(uchar *src, ulong size)
#if defined(CONFIG_PATI)
int start_sect;
#endif
-#if defined(CONFIG_PIP405) || defined(CONFIG_MIP405) || defined(CONFIG_PATI)
+#if defined(CONFIG_PIP405) || defined(CONFIG_TARGET_MIP405) ||
defined(CONFIG_PATI)
char *copystr = (char *)src;
ulong *magic = (ulong *)src;
#endif
-#if defined(CONFIG_PIP405) || defined(CONFIG_MIP405) || defined(CONFIG_PATI)
+#if defined(CONFIG_PIP405) || defined(CONFIG_TARGET_MIP405) ||
defined(CONFIG_PATI)
if (uimage_to_cpu (magic[0]) != IH_MAGIC) {
puts("Bad Magic number\n");
return -1;
@@ -701,7 +701,7 @@ void video_get_info_str (int line_number, char *info)
strcpy(buf,"### No HW ID - assuming PIP405");
}
#endif
-#ifdef CONFIG_MIP405
+#ifdef CONFIG_TARGET_MIP405
if (!s || strncmp (s, "MIP405", 6))
