powerpc: T4160QDS: Separate from T4240QDS in Kconfig

Use TARGET_T4160QDS to simplify Kconfig options.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index c1003a3521629a1b239dfafdb0970a6149e88b02..d0fdcebc04983f63835e801d14524fdf3e1726ff 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -260,6 +260,11 @@ config TARGET_T2081QDS
        select SUPPORT_SPL
        select PHYS_64BIT
 
+config TARGET_T4160QDS
+       bool "Support T4160QDS"
+       select SUPPORT_SPL
+       select PHYS_64BIT
+
 config TARGET_T4240QDS
        bool "Support T4240QDS"
        select SUPPORT_SPL

diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index 810ddb08676496ff84d5da67de8536bde6ba2f27..587736c433f44bcfdef9af480bead5e9c80adb41 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@@ -391,7 +391,7 @@ const char *serdes_clock_to_string(u32 clock)
        case SRDS_PLLCR0_RFCK_SEL_161_13:
                return "161.1328123";
        default:
-#if defined(CONFIG_T4240QDS)
+#if defined(CONFIG_T4240QDS) || defined(CONFIG_TARGET_T4160QDS)
                return "???";
 #else
                return "122.88";

diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index c6930dd1c3808e0caef5e82219ec0d4050e43578..6cfbbcddafaf7802a52edc55321d6ec126dab4e1 100644 (file)
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -27,6 +27,7 @@
 
 #if defined(CONFIG_TARGET_B4860QDS) || \
        defined(CONFIG_TARGET_B4420QDS) || \
+       defined(CONFIG_TARGET_T4160QDS) || \
        defined(CONFIG_T4240QDS) || \
        defined(CONFIG_T2080QDS) || \
        defined(CONFIG_T2080RDB) || \

diff --git a/board/freescale/t4qds/Kconfig b/board/freescale/t4qds/Kconfig
index 27a64b64b9f787901be96ae651a71307c880010e..563a87c4569cd81b2f2402e0d55b4441df43b3a5 100644 (file)
--- a/board/freescale/t4qds/Kconfig
+++ b/board/freescale/t4qds/Kconfig
@@ -1,4 +1,4 @@
-if TARGET_T4240QDS
+if TARGET_T4160QDS || TARGET_T4240QDS
 
 config SYS_BOARD
        default "t4qds"

diff --git a/board/freescale/t4qds/Makefile b/board/freescale/t4qds/Makefile
index 731ccb0b295c1fcc255b38408f6b982f04391bd8..6c51c7409de4fbf495d9d760cf9dd642c2e20f37 100644 (file)
--- a/board/freescale/t4qds/Makefile
+++ b/board/freescale/t4qds/Makefile
@@ -7,6 +7,7 @@
 ifdef CONFIG_SPL_BUILD
 obj-y  += spl.o
 else
+obj-$(CONFIG_TARGET_T4160QDS)  += t4240qds.o eth.o
 obj-$(CONFIG_T4240QDS) += t4240qds.o eth.o
 obj-$(CONFIG_PCI)      += pci.o
 endif

diff --git a/configs/T4160QDS_NAND_defconfig b/configs/T4160QDS_NAND_defconfig
index 5c981aa1eaceddf795b4133ff579c47e7a05d11e..fa3b36c8d57a22955c2d0bdbd29d6a43c0f83cb0 100644 (file)
--- a/configs/T4160QDS_NAND_defconfig
+++ b/configs/T4160QDS_NAND_defconfig
@@ -7,7 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_MPC85xx=y
-CONFIG_TARGET_T4240QDS=y
+CONFIG_TARGET_T4160QDS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/T4160QDS_SDCARD_defconfig b/configs/T4160QDS_SDCARD_defconfig
index 8c5d4ad3d59e222011eae78a9921235f61f907a2..be96916ea665718616d768a8b9e78f12ed91edba 100644 (file)
--- a/configs/T4160QDS_SDCARD_defconfig
+++ b/configs/T4160QDS_SDCARD_defconfig
@@ -7,7 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_MPC85xx=y
-CONFIG_TARGET_T4240QDS=y
+CONFIG_TARGET_T4160QDS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/T4160QDS_SECURE_BOOT_defconfig b/configs/T4160QDS_SECURE_BOOT_defconfig
index 70abd6eda4c5c9bf6d9cd8e22d25f011b0678cfd..71debf2f417d3011952e09b00b641114ac48948f 100644 (file)
--- a/configs/T4160QDS_SECURE_BOOT_defconfig
+++ b/configs/T4160QDS_SECURE_BOOT_defconfig
@@ -1,6 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
-CONFIG_TARGET_T4240QDS=y
+CONFIG_TARGET_T4160QDS=y
 # CONFIG_SYS_MALLOC_F is not set
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/T4160QDS_defconfig b/configs/T4160QDS_defconfig
index 109d6109f582b9c2438fc18a3cc1639a495c35bd..6a169c597540da3c5d064760645651781e3f699b 100644 (file)
--- a/configs/T4160QDS_defconfig
+++ b/configs/T4160QDS_defconfig
@@ -1,6 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
-CONFIG_TARGET_T4240QDS=y
+CONFIG_TARGET_T4160QDS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y