From 9c21d06c672cfe45c07a2e1bd65f05d6b5837022 Mon Sep 17 00:00:00 2001 From: York Sun Date: Mon, 21 Nov 2016 13:19:14 -0800 Subject: [PATCH] powerpc: T4160QDS: Separate from T4240QDS in Kconfig Use TARGET_T4160QDS to simplify Kconfig options. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 5 +++++ arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c | 2 +- arch/powerpc/include/asm/fsl_secure_boot.h | 1 + board/freescale/t4qds/Kconfig | 2 +- board/freescale/t4qds/Makefile | 1 + configs/T4160QDS_NAND_defconfig | 2 +- configs/T4160QDS_SDCARD_defconfig | 2 +- configs/T4160QDS_SECURE_BOOT_defconfig | 2 +- configs/T4160QDS_defconfig | 2 +- 9 files changed, 13 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index c1003a3521..d0fdcebc04 100644 --- 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 810ddb0867..587736c433 100644 --- 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 c6930dd1c3..6cfbbcddaf 100644 --- 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 27a64b64b9..563a87c456 100644 --- 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 731ccb0b29..6c51c7409d 100644 --- 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 5c981aa1ea..fa3b36c8d5 100644 --- 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 8c5d4ad3d5..be96916ea6 100644 --- 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 70abd6eda4..71debf2f41 100644 --- 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 109d6109f5..6a169c5975 100644 --- 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 -- 2.25.1