Rework arch/ppc/Kconfig to select processor types. Move MPC5200 configuration to architecture sub-directory. pcm030 configuration file is updated to reflect changes. Signed-off-by: Renaud Barbier <renaud.barbier@xxxxxx> --- arch/ppc/Kconfig | 45 ++++++------------------------ arch/ppc/configs/pcm030_defconfig | 2 + arch/ppc/mach-mpc5xxx/Kconfig | 54 +++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 36 deletions(-) diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 4c7b7cd..cd561b1 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig @@ -1,53 +1,26 @@ - -config BOARDINFO - default "Phytec Phycore mpc5200b tiny" if MACH_PHYCORE_MPC5200B_TINY - -config ARCH_TEXT_BASE - hex - default 0x00000000 if RELOCATABLE - default 0x01000000 if MACH_PHYCORE_MPC5200B_TINY - config PPC bool select HAVE_CONFIGURABLE_TEXT_BASE select HAS_KALLSYMS select HAS_MODULES select HAVE_CONFIGURABLE_MEMORY_LAYOUT - select HAVE_CONFIGURABLE_TEXT_BASE default y -# Uh, we should decide which one we want to use -config ARCH_MPC5200 - bool - -config MPC5200 - bool - -config MPC5xxx - bool +menu "Architecture Type" -config CACHELINE_SIZE - int - default 32 if ARCH_MPC5200 +choice + prompt "PPC Architecture type" -config HAS_REGINFO - bool - default y if ARCH_MPC5200 +config ARCH_MPC8XXX + bool "Freescale MPC85xx" -choice - prompt "Select your board" +config ARCH_MPC5XXX + bool "Freescale MPC5xxx" -config MACH_PHYCORE_MPC5200B_TINY - bool "Phycore mpc5200b tiny" - select ARCH_MPC5200 - select MPC5200 - select MPC5xxx - select HAS_CFI - help - Say Y here if you are using the Phytec Phycore MPC5200B Tiny - board aka pcm030 endchoice +endmenu + source arch/ppc/mach-mpc5xxx/Kconfig source common/Kconfig source commands/Kconfig diff --git a/arch/ppc/configs/pcm030_defconfig b/arch/ppc/configs/pcm030_defconfig index 6016076..5488c44 100644 --- a/arch/ppc/configs/pcm030_defconfig +++ b/arch/ppc/configs/pcm030_defconfig @@ -17,6 +17,8 @@ CONFIG_NET=y CONFIG_NET_DHCP=y CONFIG_NET_PING=y CONFIG_NET_TFTP=y +CONFIG_ARCH_MPC5XXX=y +CONFIG_MACH_PHYCORE_MPC5200B_TINY=y CONFIG_DRIVER_NET_MPC5200=y CONFIG_DRIVER_CFI=y CONFIG_FS_CRAMFS=y diff --git a/arch/ppc/mach-mpc5xxx/Kconfig b/arch/ppc/mach-mpc5xxx/Kconfig index 632fb85..088d07e 100644 --- a/arch/ppc/mach-mpc5xxx/Kconfig +++ b/arch/ppc/mach-mpc5xxx/Kconfig @@ -1,3 +1,55 @@ +if ARCH_MPC5XXX + +config CLOCKSOURCE_MASK + int + default 32 + +config CLOCKSOURCE_SHIFT + int + default 15 + +config BOARDINFO + default "Phytec Phycore mpc5200b tiny" if MACH_PHYCORE_MPC5200B_TINY + +config ARCH_TEXT_BASE + hex + default 0x00000000 if RELOCATABLE + default 0x01000000 if MACH_PHYCORE_MPC5200B_TINY + +config HAS_REGINFO + bool + default y if ARCH_MPC5200 + +config CACHELINE_SIZE + int + default 32 if ARCH_MPC5200 + +choice + prompt "Select your board" + +config MACH_PHYCORE_MPC5200B_TINY + bool "Phycore mpc5200b tiny" + select HAS_CFI + help + Say Y here if you are using the Phytec Phycore MPC5200B Tiny + board aka pcm030 +endchoice + +config MPC5200 + bool + depends on MACH_PHYCORE_MPC5200B_TINY + default y + +config ARCH_MPC5200 + bool + depends on MACH_PHYCORE_MPC5200B_TINY + default y + +config MPC5xxx + bool + depends on MACH_PHYCORE_MPC5200B_TINY + default y + menu "Board specific settings " config MACH_PHYCORE_MPC5200B_TINY_REV @@ -10,3 +62,5 @@ config MACH_PHYCORE_MPC5200B_TINY_REV old board you should set this option to 1 endmenu + +endif -- 1.7.6.4 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
