diff options
| author | York Sun | 2016-12-01 18:37:55 -0800 |
|---|---|---|
| committer | York Sun | 2016-12-02 08:52:34 -0800 |
| commit | 22a1b99a1dd82cb06d05de81a8bc3c52f8b0b5bb (patch) | |
| tree | b76ed90e51273b4a9df560c0c4a0d34fcf7da3a1 | |
| parent | 6b29a395b62965eef6b5065d3a526a8588a92038 (diff) | |
powerpc: cyrus: Separate P5020/P5040 config options
Instead of using EXTRA options in defconfig, use two targets
in Kconfig to select correct SoC.
Signed-off-by: York Sun <york.sun@nxp.com>
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 10 | ||||
| -rw-r--r-- | board/varisys/cyrus/Kconfig | 2 | ||||
| -rw-r--r-- | configs/Cyrus_P5020_defconfig | 4 | ||||
| -rw-r--r-- | configs/Cyrus_P5040_defconfig | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 3ee7d2f0c57..9a5cd853993 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -309,8 +309,14 @@ config TARGET_UCP1020 bool "Support uCP1020" select ARCH_P1020 -config TARGET_CYRUS - bool "Support Varisys Cyrus" +config TARGET_CYRUS_P5020 + bool "Support Varisys Cyrus P5020" + select ARCH_P5020 + select PHYS_64BIT + +config TARGET_CYRUS_P5040 + bool "Support Varisys Cyrus P5040" + select ARCH_P5040 select PHYS_64BIT endchoice diff --git a/board/varisys/cyrus/Kconfig b/board/varisys/cyrus/Kconfig index d9ea7ef89c5..c7b52539265 100644 --- a/board/varisys/cyrus/Kconfig +++ b/board/varisys/cyrus/Kconfig @@ -1,4 +1,4 @@ -if TARGET_CYRUS +if TARGET_CYRUS_P5020 || TARGET_CYRUS_P5040 config SYS_BOARD default "cyrus" diff --git a/configs/Cyrus_P5020_defconfig b/configs/Cyrus_P5020_defconfig index 94fc387e790..4c124d9fb24 100644 --- a/configs/Cyrus_P5020_defconfig +++ b/configs/Cyrus_P5020_defconfig @@ -1,11 +1,11 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_CYRUS=y +CONFIG_TARGET_CYRUS_P5020=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000,ARCH_P5020" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000" CONFIG_BOOTDELAY=10 CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y diff --git a/configs/Cyrus_P5040_defconfig b/configs/Cyrus_P5040_defconfig index 4b50772843c..aa683227bde 100644 --- a/configs/Cyrus_P5040_defconfig +++ b/configs/Cyrus_P5040_defconfig @@ -1,11 +1,11 @@ CONFIG_PPC=y CONFIG_MPC85xx=y -CONFIG_TARGET_CYRUS=y +CONFIG_TARGET_CYRUS_P5040=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000,ARCH_P5040" +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SYS_TEXT_BASE=0xFFF40000" CONFIG_BOOTDELAY=10 CONFIG_CONSOLE_MUX=y CONFIG_HUSH_PARSER=y |