Skip to contentSkip to conversation

arm: kconfig: move board select menus and other settings to SoC dir

PATCH New Masahiro Yamada 5 participants 29 messages Aug 4, 2014 – Aug 5, 2014

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover arm: kconfig: move board select menus and other settings to SoC dir

There are lots of boards supported in ARM architecture. The board select menu in arch/arm/Kconfig is already too fat.

This series introduces platform select between arch select and board select.

ARCH select (ARM)
|-- Platform select
|-- Board select

Many (not all) of boards have been moved to $(SOC)/Kconfig.

I built all the boards and confirmed the same binareis are produced with/without thie series.

Prerequisites
-------------
Apply
http://patchwork.ozlabs.org/patch/374416/
to avoid a conflict in doc/README.scrapyard

Apply
http://patchwork.ozlabs.org/patch/375467/
to avoid a conflict in configs/jetson-tk1_defconfig

Masahiro Yamada (15):
omap: remove omap5912osk board support
zynq: kconfig: move board select menu and common settings
tegra: kconfig: move board select menu and common settings
rmobile: kconfig: move board select menu and common settings
versatile: kconfig: move common settings
kirkwood: kconfig: refactor Kconfig and defconfig
exynos: kconfig: move board select menu and common settings
davinci: kconfig: move board select menu and common settings
omap3: kconfig: move board select menu and common settings
omap4: kconfig: move board select menu and common settings
omap5: kconfig: move board select menu and common settings
keystone: kconfig: move board select menu and common settings
orion5x: kconfig: move board select menu and common settings
highbank: kconfig: move common settings
nomadik: kconfig: move board select menu and common settings

 arch/arm/Kconfig                                   |  461 +-----
 arch/arm/cpu/arm926ejs/davinci/Kconfig             |   79 +
 arch/arm/cpu/arm926ejs/kirkwood/Kconfig            |   89 ++
 arch/arm/cpu/arm926ejs/nomadik/Kconfig             |   21 +
 arch/arm/cpu/arm926ejs/orion5x/Kconfig             |   21 +
 .../arm/cpu/arm926ejs/versatile}/Kconfig           |   10 +-
 arch/arm/cpu/armv7/exynos/Kconfig                  |   55 +
 {board => arch/arm/cpu/armv7}/highbank/Kconfig     |    2 +-
 arch/arm/cpu/armv7/keystone/Kconfig                |   24 +
 arch/arm/cpu/armv7/omap3/Kconfig                   |  107 ++
 arch/arm/cpu/armv7/omap4/Kconfig                   |   29 +
 arch/arm/cpu/armv7/omap5/Kconfig                   |   29 +
 arch/arm/cpu/armv7/rmobile/Kconfig                 |   37 +
 arch/arm/cpu/armv7/tegra-common/Kconfig            |   30 +
 arch/arm/cpu/armv7/tegra114/Kconfig                |   17 +
 arch/arm/cpu/armv7/tegra124/Kconfig                |   21 +
 arch/arm/cpu/armv7/tegra20/Kconfig                 |   53 +
 arch/arm/cpu/armv7/tegra30/Kconfig                 |   25 +
 arch/arm/cpu/armv7/zynq/Kconfig                    |   43 +
 arch/arm/include/asm/arch-tegra114/tegra.h         |    2 -
 arch/arm/include/asm/arch-tegra124/tegra.h         |    2 -
 arch/arm/include/asm/arch-tegra20/tegra.h          |    2 -
 arch/arm/include/asm/arch-tegra30/tegra.h          |    2 -
 board/8dtech/eco5pk/Kconfig                        |    8 -
 board/Barix/ipam390/Kconfig                        |    8 -
 board/LaCie/edminiv2/Kconfig                       |    8 -
 board/LaCie/net2big_v2/Kconfig                     |    8 -
 board/LaCie/netspace_v2/Kconfig                    |    8 -
 board/LaCie/wireless_space/Kconfig                 |    8 -
 board/Marvell/dreamplug/Kconfig                    |    8 -
 board/Marvell/guruplug/Kconfig                     |    8 -
 board/Marvell/mv88f6281gtw_ge/Kconfig              |    8 -
 board/Marvell/openrd/Kconfig                       |    8 -
 board/Marvell/rd6281a/Kconfig                      |    8 -
 board/Marvell/sheevaplug/Kconfig                   |    8 -
 board/Seagate/dockstar/Kconfig                     |    8 -
 board/Seagate/goflexhome/Kconfig                   |    8 -
 board/ait/cam_enc_4xx/Kconfig                      |    8 -
 board/armltd/versatile/Kconfig                     |   71 -
 board/atmark-techno/armadillo-800eva/Kconfig       |    8 -
 board/avionic-design/medcom-wide/Kconfig           |    9 -
 board/avionic-design/plutux/Kconfig                |    9 -
 board/avionic-design/tec-ng/Kconfig                |    9 -
 board/avionic-design/tec/Kconfig                   |    9 -
 board/buffalo/lsxl/Kconfig                         |    8 -
 board/cloudengines/pogo_e02/Kconfig                |    8 -
 board/comelit/dig297/Kconfig                       |    8 -
 board/compal/paz00/Kconfig                         |    9 -
 board/compulab/cm_t35/Kconfig                      |    8 -
 board/compulab/cm_t54/Kconfig                      |    8 -
 board/compulab/trimslice/Kconfig                   |    9 -
 board/corscience/tricorder/Kconfig                 |    8 -
 board/d-link/dns325/Kconfig                        |    8 -
 board/davinci/da8xxevm/Kconfig                     |   24 -
 board/davinci/dm355evm/Kconfig                     |    8 -
 board/davinci/dm355leopard/Kconfig                 |    8 -
 board/davinci/dm365evm/Kconfig                     |    8 -
 board/davinci/dm6467evm/Kconfig                    |    8 -
 board/davinci/dvevm/Kconfig                        |    8 -
 board/davinci/ea20/Kconfig                         |    8 -
 board/davinci/schmoogie/Kconfig                    |    8 -
 board/davinci/sffsdr/Kconfig                       |    8 -
 board/davinci/sonata/Kconfig                       |    8 -
 board/enbw/enbw_cmc/Kconfig                        |    8 -
 board/gumstix/duovero/Kconfig                      |    8 -
 board/htkw/mcx/Kconfig                             |    8 -
 board/iomega/iconnect/Kconfig                      |    8 -
 board/isee/igep00x0/Kconfig                        |    8 -
 board/karo/tk71/Kconfig                            |    8 -
 board/keymile/km_arm/Kconfig                       |    8 -
 board/kmc/kzm9g/Kconfig                            |    8 -
 board/logicpd/am3517evm/Kconfig                    |    8 -
 board/logicpd/omap3som/Kconfig                     |    8 -
 board/logicpd/zoom1/Kconfig                        |    8 -
 board/matrix_vision/mvblx/Kconfig                  |    8 -
 board/nokia/rx51/Kconfig                           |    8 -
 board/nvidia/beaver/Kconfig                        |    9 -
 board/nvidia/cardhu/Kconfig                        |    9 -
 board/nvidia/dalmore/Kconfig                       |    9 -
 board/nvidia/harmony/Kconfig                       |    9 -
 board/nvidia/jetson-tk1/Kconfig                    |    9 -
 board/nvidia/seaboard/Kconfig                      |    9 -
 board/nvidia/venice2/Kconfig                       |    9 -
 board/nvidia/ventana/Kconfig                       |    9 -
 board/nvidia/whistler/Kconfig                      |    9 -
 board/omicron/calimain/Kconfig                     |    8 -
 board/overo/Kconfig                                |    8 -
 board/pandora/Kconfig                              |    8 -
 board/raidsonic/ib62x0/Kconfig                     |    8 -
 board/renesas/alt/Kconfig                          |    8 -
 board/renesas/koelsch/Kconfig                      |    8 -
 board/renesas/lager/Kconfig                        |    8 -
 board/samsung/arndale/Kconfig                      |    8 -
 board/samsung/origen/Kconfig                       |    8 -
 board/samsung/smdk5250/Kconfig                     |   16 -
 board/samsung/smdk5420/Kconfig                     |   16 -
 board/samsung/smdkv310/Kconfig                     |    8 -
 board/samsung/trats/Kconfig                        |    8 -
 board/samsung/trats2/Kconfig                       |    8 -
 board/samsung/universal_c210/Kconfig               |    8 -
 board/st/nhk8815/Kconfig                           |   10 +-
 board/technexion/tao3530/Kconfig                   |    8 -
 board/technexion/twister/Kconfig                   |    8 -
 board/teejet/mt_ventoux/Kconfig                    |    8 -
 board/ti/am3517crane/Kconfig                       |    8 -
 board/ti/beagle/Kconfig                            |    8 -
 board/ti/dra7xx/Kconfig                            |    8 -
 board/ti/evm/Kconfig                               |   24 -
 board/ti/ks2_evm/Kconfig                           |   16 -
 board/ti/omap5912osk/MAINTAINERS                   |    6 -
 board/ti/omap5912osk/Makefile                      |    9 -
 board/ti/omap5912osk/config.mk                     |   30 -
 board/ti/omap5912osk/lowlevel_init.S               |  477 -------
 board/ti/omap5912osk/omap5912osk.c                 |  307 ----
 board/ti/omap5_uevm/Kconfig                        |    8 -
 board/ti/panda/Kconfig                             |    8 -
 board/ti/sdp3430/Kconfig                           |    8 -
 board/ti/sdp4430/Kconfig                           |    8 -
 board/timll/devkit8000/Kconfig                     |    8 -
 board/toradex/colibri_t20_iris/Kconfig             |    9 -
 board/xilinx/zynq/Kconfig                          |   95 --
 board/xilinx/zynq/MAINTAINERS                      |   12 +-
 configs/alt_defconfig                              |    1 +
 configs/am3517_crane_defconfig                     |    1 +
 configs/am3517_evm_defconfig                       |    1 +
 configs/armadillo-800eva_defconfig                 |    1 +
 configs/arndale_defconfig                          |    1 +
 configs/beaver_defconfig                           |    3 +-
 configs/calimain_defconfig                         |    1 +
 configs/cam_enc_4xx_defconfig                      |    1 +
 configs/cardhu_defconfig                           |    3 +-
 configs/cm_t35_defconfig                           |    1 +
 configs/cm_t54_defconfig                           |    1 +
 configs/colibri_t20_iris_defconfig                 |    3 +-
 configs/d2net_v2_defconfig                         |    1 +
 configs/da830evm_defconfig                         |    1 +
 configs/da850_am18xxevm_defconfig                  |    1 +
 configs/da850evm_defconfig                         |    1 +
 configs/da850evm_direct_nor_defconfig              |    1 +
 configs/dalmore_defconfig                          |    3 +-
 configs/davinci_dm355evm_defconfig                 |    1 +
 configs/davinci_dm355leopard_defconfig             |    1 +
 configs/davinci_dm365evm_defconfig                 |    1 +
 configs/davinci_dm6467Tevm_defconfig               |    1 +
 configs/davinci_dm6467evm_defconfig                |    1 +
 configs/davinci_dvevm_defconfig                    |    1 +
 configs/davinci_schmoogie_defconfig                |    1 +
 configs/davinci_sffsdr_defconfig                   |    1 +
 configs/davinci_sonata_defconfig                   |    1 +
 configs/devkit8000_defconfig                       |    1 +
 configs/dig297_defconfig                           |    1 +
 configs/dns325_defconfig                           |    1 +
 configs/dockstar_defconfig                         |    1 +
 configs/dra7xx_evm_defconfig                       |    1 +
 configs/dra7xx_evm_qspiboot_defconfig              |    1 +
 configs/dra7xx_evm_uart3_defconfig                 |    1 +
 configs/dreamplug_defconfig                        |    1 +
 configs/duovero_defconfig                          |    1 +
 configs/ea20_defconfig                             |    1 +
 configs/eco5pk_defconfig                           |    1 +
 configs/edminiv2_defconfig                         |    1 +
 configs/enbw_cmc_defconfig                         |    1 +
 configs/goflexhome_defconfig                       |    1 +
 configs/guruplug_defconfig                         |    1 +
 configs/harmony_defconfig                          |    3 +-
 configs/hawkboard_defconfig                        |    1 +
 configs/hawkboard_uart_defconfig                   |    1 +
 configs/highbank_defconfig                         |    2 +-
 configs/ib62x0_defconfig                           |    1 +
 configs/iconnect_defconfig                         |    1 +
 configs/igep0020_defconfig                         |    1 +
 configs/igep0020_nand_defconfig                    |    1 +
 configs/igep0030_defconfig                         |    1 +
 configs/igep0030_nand_defconfig                    |    1 +
 configs/igep0032_defconfig                         |    1 +
 configs/inetspace_v2_defconfig                     |    1 +
 configs/ipam390_defconfig                          |    1 +
 configs/jetson-tk1_defconfig                       |    3 +-
 configs/k2e_evm_defconfig                          |    1 +
 configs/k2hk_evm_defconfig                         |    1 +
 configs/km_kirkwood_128m16_defconfig               |    1 +
 configs/km_kirkwood_defconfig                      |    1 +
 configs/km_kirkwood_pci_defconfig                  |    1 +
 configs/kmcoge5un_defconfig                        |    1 +
 configs/kmnusa_defconfig                           |    1 +
 configs/kmsugp1_defconfig                          |    1 +
 configs/kmsuv31_defconfig                          |    1 +
 configs/koelsch_defconfig                          |    1 +
 configs/kzm9g_defconfig                            |    1 +
 configs/lager_defconfig                            |    1 +
 configs/lschlv2_defconfig                          |    1 +
 configs/lsxhl_defconfig                            |    1 +
 configs/mcx_defconfig                              |    1 +
 configs/medcom-wide_defconfig                      |    3 +-
 configs/mgcoge3un_defconfig                        |    1 +
 configs/mt_ventoux_defconfig                       |    1 +
 configs/mv88f6281gtw_ge_defconfig                  |    1 +
 configs/net2big_v2_defconfig                       |    1 +
 configs/netspace_lite_v2_defconfig                 |    1 +
 configs/netspace_max_v2_defconfig                  |    1 +
 configs/netspace_mini_v2_defconfig                 |    1 +
 configs/netspace_v2_defconfig                      |    1 +
 configs/nhk8815_defconfig                          |    3 +-
 configs/nhk8815_onenand_defconfig                  |    3 +-
 configs/nokia_rx51_defconfig                       |    1 +
 configs/omap3_beagle_defconfig                     |    1 +
 configs/omap3_evm_defconfig                        |    1 +
 configs/omap3_evm_quick_mmc_defconfig              |    1 +
 configs/omap3_evm_quick_nand_defconfig             |    1 +
 configs/omap3_ha_defconfig                         |    1 +
 configs/omap3_logic_defconfig                      |    1 +
 configs/omap3_mvblx_defconfig                      |    1 +
 configs/omap3_overo_defconfig                      |    1 +
 configs/omap3_pandora_defconfig                    |    1 +
 configs/omap3_sdp3430_defconfig                    |    1 +
 configs/omap3_zoom1_defconfig                      |    1 +
 configs/omap4_panda_defconfig                      |    1 +
 configs/omap4_sdp4430_defconfig                    |    1 +
 configs/omap5912osk_defconfig                      |    2 -
 configs/omap5_uevm_defconfig                       |    1 +
 configs/openrd_base_defconfig                      |    1 +
 configs/openrd_client_defconfig                    |    1 +
 configs/openrd_ultimate_defconfig                  |    1 +
 configs/origen_defconfig                           |    1 +
 configs/paz00_defconfig                            |    3 +-
 configs/peach-pit_defconfig                        |    1 +
 configs/plutux_defconfig                           |    3 +-
 configs/pogo_e02_defconfig                         |    1 +
 configs/portl2_defconfig                           |    1 +
 configs/rd6281a_defconfig                          |    1 +
 configs/s5pc210_universal_defconfig                |    1 +
 configs/seaboard_defconfig                         |    3 +-
 configs/sheevaplug_defconfig                       |    1 +
 configs/smdk5250_defconfig                         |    1 +
 configs/smdk5420_defconfig                         |    1 +
 configs/smdkv310_defconfig                         |    1 +
 configs/snow_defconfig                             |    1 +
 configs/tao3530_defconfig                          |    1 +
 configs/tec-ng_defconfig                           |    3 +-
 configs/tec_defconfig                              |    3 +-
 configs/tk71_defconfig                             |    1 +
 configs/trats2_defconfig                           |    1 +
 configs/trats_defconfig                            |    1 +
 configs/tricorder_defconfig                        |    1 +
 configs/tricorder_flash_defconfig                  |    1 +
 configs/trimslice_defconfig                        |    3 +-
 configs/twister_defconfig                          |    1 +
 configs/venice2_defconfig                          |    3 +-
 configs/ventana_defconfig                          |    3 +-
 configs/versatileab_defconfig                      |    2 +-
 configs/versatilepb_defconfig                      |    2 +-
 configs/versatileqemu_defconfig                    |    2 +-
 configs/whistler_defconfig                         |    3 +-
 configs/wireless_space_defconfig                   |    1 +
 configs/zynq_microzed_defconfig                    |    1 +
 configs/zynq_zc70x_defconfig                       |    1 +
 configs/zynq_zc770_xm010_defconfig                 |    1 +
 configs/zynq_zc770_xm012_defconfig                 |    1 +
 configs/zynq_zc770_xm013_defconfig                 |    1 +
 configs/zynq_zed_defconfig                         |    1 +
 doc/README.scrapyard                               |    1 +
 drivers/usb/gadget/Makefile                        |    1 -
 drivers/usb/gadget/omap1510_udc.c                  | 1506 --------------------
 include/configs/alt.h                              |    1 -
 include/configs/am3517_crane.h                     |    1 -
 include/configs/am3517_evm.h                       |    1 -
 include/configs/armadillo-800eva.h                 |    1 -
 include/configs/cm_t35.h                           |    1 -
 include/configs/devkit8000.h                       |    1 -
 include/configs/dig297.h                           |    1 -
 include/configs/dns325.h                           |    1 -
 include/configs/dockstar.h                         |    1 -
 include/configs/dreamplug.h                        |    1 -
 include/configs/edminiv2.h                         |    1 -
 include/configs/goflexhome.h                       |    1 -
 include/configs/guruplug.h                         |    1 -
 include/configs/ib62x0.h                           |    1 -
 include/configs/iconnect.h                         |    1 -
 include/configs/km/km_arm.h                        |    1 -
 include/configs/koelsch.h                          |    1 -
 include/configs/kzm9g.h                            |    1 -
 include/configs/lacie_kw.h                         |    1 -
 include/configs/lager.h                            |    1 -
 include/configs/lsxl.h                             |    1 -
 include/configs/mcx.h                              |    1 -
 include/configs/mv88f6281gtw_ge.h                  |    1 -
 include/configs/nhk8815.h                          |    2 -
 include/configs/nokia_rx51.h                       |    1 -
 include/configs/omap1510.h                         |  756 ----------
 include/configs/omap3_evm_common.h                 |    1 -
 include/configs/omap3_logic.h                      |    1 -
 include/configs/omap3_mvblx.h                      |    1 -
 include/configs/omap3_pandora.h                    |    1 -
 include/configs/omap3_sdp3430.h                    |    1 -
 include/configs/omap5912osk.h                      |  174 ---
 include/configs/openrd.h                           |    1 -
 include/configs/pogo_e02.h                         |    1 -
 include/configs/rd6281a.h                          |    1 -
 include/configs/sheevaplug.h                       |    1 -
 include/configs/tam3517-common.h                   |    1 -
 include/configs/tao3530.h                          |    1 -
 include/configs/tegra-common.h                     |    1 -
 include/configs/ti_omap3_common.h                  |    1 -
 include/configs/ti_omap4_common.h                  |    1 -
 include/configs/ti_omap5_common.h                  |    1 -
 include/configs/tk71.h                             |    1 -
 include/configs/tricorder.h                        |    1 -
 include/configs/wireless_space.h                   |    1 -
 include/configs/zynq-common.h                      |    1 -
 309 files changed, 904 insertions(+), 4728 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/davinci/Kconfig
 create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/Kconfig
 create mode 100644 arch/arm/cpu/arm926ejs/nomadik/Kconfig
 create mode 100644 arch/arm/cpu/arm926ejs/orion5x/Kconfig
 rename {board/ti/omap5912osk => arch/arm/cpu/arm926ejs/versatile}/Kconfig (61%)
 create mode 100644 arch/arm/cpu/armv7/exynos/Kconfig
 rename {board => arch/arm/cpu/armv7}/highbank/Kconfig (90%)
 create mode 100644 arch/arm/cpu/armv7/keystone/Kconfig
 create mode 100644 arch/arm/cpu/armv7/omap3/Kconfig
 create mode 100644 arch/arm/cpu/armv7/omap4/Kconfig
 create mode 100644 arch/arm/cpu/armv7/omap5/Kconfig
 create mode 100644 arch/arm/cpu/armv7/rmobile/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra-common/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra114/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra124/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra20/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra30/Kconfig
 create mode 100644 arch/arm/cpu/armv7/zynq/Kconfig
 delete mode 100644 board/armltd/versatile/Kconfig
 delete mode 100644 board/ti/omap5912osk/MAINTAINERS
 delete mode 100644 board/ti/omap5912osk/Makefile
 delete mode 100644 board/ti/omap5912osk/config.mk
 delete mode 100644 board/ti/omap5912osk/lowlevel_init.S
 delete mode 100644 board/ti/omap5912osk/omap5912osk.c
 delete mode 100644 board/xilinx/zynq/Kconfig
 delete mode 100644 configs/omap5912osk_defconfig
 delete mode 100644 drivers/usb/gadget/omap1510_udc.c
 delete mode 100644 include/configs/omap1510.h
 delete mode 100644 include/configs/omap5912osk.h
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/15 omap: remove omap5912osk board support

Emails to the board maintainer
"Rishi Bhattacharya <[email protected]>"
have been bouncing.

Tom suggested to remove this board.

Remove also omap1510_udc.c because this is the last board to enable it.

---

 arch/arm/Kconfig                     |    4 -
 board/ti/omap5912osk/Kconfig         |   23 -
 board/ti/omap5912osk/MAINTAINERS     |    6 -
 board/ti/omap5912osk/Makefile        |    9 -
 board/ti/omap5912osk/config.mk       |   30 -
 board/ti/omap5912osk/lowlevel_init.S |  477 -----------
 board/ti/omap5912osk/omap5912osk.c   |  307 -------
 configs/omap5912osk_defconfig        |    2 -
 doc/README.scrapyard                 |    1 +
 drivers/usb/gadget/Makefile          |    1 -
 drivers/usb/gadget/omap1510_udc.c    | 1506 ----------------------------------
 include/configs/omap1510.h           |  756 -----------------
 include/configs/omap5912osk.h        |  174 ----
 13 files changed, 1 insertion(+), 3295 deletions(-)
 delete mode 100644 board/ti/omap5912osk/Kconfig
 delete mode 100644 board/ti/omap5912osk/MAINTAINERS
 delete mode 100644 board/ti/omap5912osk/Makefile
 delete mode 100644 board/ti/omap5912osk/config.mk
 delete mode 100644 board/ti/omap5912osk/lowlevel_init.S
 delete mode 100644 board/ti/omap5912osk/omap5912osk.c
 delete mode 100644 configs/omap5912osk_defconfig
 delete mode 100644 drivers/usb/gadget/omap1510_udc.c
 delete mode 100644 include/configs/omap1510.h
 delete mode 100644 include/configs/omap5912osk.h
arch/arm/Kconfig +0 -4
index e385eda..e97f94d 100644
@@ -287,9 +287,6 @@ config TARGET_SC_SPS_1
 config TARGET_NHK8815
 	bool "Support nhk8815"
 
-config TARGET_OMAP5912OSK
-	bool "Support omap5912osk"
-
 config TARGET_EDMINIV2
 	bool "Support edminiv2"
 
@@ -977,7 +974,6 @@ source "board/ti/beagle/Kconfig"
 source "board/ti/dra7xx/Kconfig"
 source "board/ti/evm/Kconfig"
 source "board/ti/ks2_evm/Kconfig"
-source "board/ti/omap5912osk/Kconfig"
 source "board/ti/omap5_uevm/Kconfig"
 source "board/ti/panda/Kconfig"
 source "board/ti/sdp3430/Kconfig"
board/ti/omap5912osk/Kconfig deleted +0 -23
deleted file mode 100644
index 9f7493a..0000000
@@ -1,23 +0,0 @@
-if TARGET_OMAP5912OSK
-
-config SYS_CPU
-	string
-	default "arm926ejs"
-
-config SYS_BOARD
-	string
-	default "omap5912osk"
-
-config SYS_VENDOR
-	string
-	default "ti"
-
-config SYS_SOC
-	string
-	default "omap"
-
-config SYS_CONFIG_NAME
-	string
-	default "omap5912osk"
-
-endif
board/ti/omap5912osk/MAINTAINERS deleted +0 -6
deleted file mode 100644
index 43ffb9b..0000000
@@ -1,6 +0,0 @@
-OMAP5912OSK BOARD
-M:	Rishi Bhattacharya <[email protected]>
-S:	Maintained
-F:	board/ti/omap5912osk/
-F:	include/configs/omap5912osk.h
-F:	configs/omap5912osk_defconfig
board/ti/omap5912osk/Makefile deleted +0 -9
deleted file mode 100644
index d7c0ebd..0000000
@@ -1,9 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y	:= omap5912osk.o
-obj-y	+= lowlevel_init.o
board/ti/omap5912osk/config.mk deleted +0 -30
deleted file mode 100644
index 5b8d952..0000000
@@ -1,30 +0,0 @@
-#
-# (C) Copyright 2002-2004
-# Gary Jennejohn, DENX Software Engineering, <[email protected]>
-# David Mueller, ELSOFT AG, <[email protected]>
-#
-# (C) Copyright 2003
-# Texas Instruments, <www.ti.com>
-# Kshitij Gupta <[email protected]>
-#
-# (C) Copyright 2004
-# Texas Instruments, <www.ti.com>
-# Rishi Bhattacharya <[email protected]>
-#
-# TI OSK board with OMAP5912 (ARM925EJS) cpu
-# see http://www.ti.com/ for more information on Texas Instruments
-#
-# OSK has 1 bank of 32 MB SDRAM
-# Physical Address:
-# 1000'0000 to 1200'0000
-#
-#
-# Linux-Kernel is expected to be at 1000'8000, entry 1000'8000
-# (mem base + reserved)
-#
-# When running from RAM use address 1108'0000, otherwise when
-# booting from NOR flash link to address 0000'0000.
-#
-
-CONFIG_SYS_TEXT_BASE = 0x00000000
-#CONFIG_SYS_TEXT_BASE = 0x11080000
board/ti/omap5912osk/lowlevel_init.S deleted +0 -477

477 lines not on this page · raw message

board/ti/omap5912osk/omap5912osk.c deleted +0 -307

307 lines not on this page · raw message

configs/omap5912osk_defconfig deleted +0 -2
deleted file mode 100644
index 5aeb097..0000000
@@ -1,2 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_OMAP5912OSK=y
doc/README.scrapyard +1 -0
index b950a41..6f28ab0 100644
@@ -12,6 +12,7 @@ The list should be sorted in reverse chronological order.
 
 Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
 =================================================================================================
+omap5912osk      arm         arm926ejs      -           -           Rishi Bhattacharya <[email protected]>
 p1023rds         powerpc     mpc85xx        d0bc5140    2014-07-22  Roy Zang <[email protected]>
 spc1920          powerpc     mpc8xx         98ad54be    2014-07-07
 v37              powerpc     mpc8xx         b8c1438a    2014-07-07
drivers/usb/gadget/Makefile +0 -1
index 4eea907..2efd5a4 100644
@@ -31,7 +31,6 @@ ifdef CONFIG_USB_DEVICE
 obj-y += core.o
 obj-y += ep0.o
 obj-$(CONFIG_DW_UDC) += designware_udc.o
-obj-$(CONFIG_OMAP1610) += omap1510_udc.o
 obj-$(CONFIG_MPC885_FAMILY) += mpc8xx_udc.o
 obj-$(CONFIG_CPU_PXA27X) += pxa27x_udc.o
 endif
drivers/usb/gadget/omap1510_udc.c deleted +0 -1506

1,506 lines not on this page · raw message

include/configs/omap1510.h deleted +0 -756

610 lines not on this page · raw message

include/configs/omap5912osk.h deleted +0 -174

174 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.9.1

Part of the diff is not shown here. View the raw message.

#2 lore raw

PATCH 1/15 omap: remove omap5912osk board support

Quoted 11 lines · Masahiro Yamada

Emails to the board maintainer
"Rishi Bhattacharya <[email protected]>"
have been bouncing.

Tom suggested to remove this board.

Remove also omap1510_udc.c because this is the last board to enable it.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140804/a8460993/attachment.pgp>
#3 lore raw

PATCH 2/15 zynq: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Zynq board select menu to zynq/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="zynq").

Refactor board/xilinx/zynq/MAINTAINERS too.

---

 arch/arm/Kconfig                   | 15 ++----
 arch/arm/cpu/armv7/zynq/Kconfig    | 43 +++++++++++++++++
 board/xilinx/zynq/Kconfig          | 95 --------------------------------------
 board/xilinx/zynq/MAINTAINERS      | 12 +----
 configs/zynq_microzed_defconfig    |  1 +
 configs/zynq_zc70x_defconfig       |  1 +
 configs/zynq_zc770_xm010_defconfig |  1 +
 configs/zynq_zc770_xm012_defconfig |  1 +
 configs/zynq_zc770_xm013_defconfig |  1 +
 configs/zynq_zed_defconfig         |  1 +
 include/configs/zynq-common.h      |  1 -
 11 files changed, 54 insertions(+), 118 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/zynq/Kconfig
 delete mode 100644 board/xilinx/zynq/Kconfig
arch/arm/Kconfig +3 -12
index e97f94d..f4faffc 100644
@@ -656,17 +656,8 @@ config TARGET_U8500_HREF
 config TARGET_VF610TWR
 	bool "Support vf610twr"
 
-config TARGET_ZYNQ_MICROZED
-	bool "Support zynq_microzed"
-
-config TARGET_ZYNQ_ZC70X
-	bool "Support zynq_zc70x"
-
-config TARGET_ZYNQ_ZC770
-	bool "Support zynq_zc770"
-
-config TARGET_ZYNQ_ZED
-	bool "Support zynq_zed"
+config ZYNQ
+	bool "Xilinx Zynq Platform"
 
 config TARGET_MEDCOM_WIDE
 	bool "Support medcom-wide"
@@ -769,6 +760,7 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/armv7/zynq/Kconfig"
 source "board/8dtech/eco5pk/Kconfig"
 source "board/Barix/ipam390/Kconfig"
 source "board/BuR/kwb/Kconfig"
@@ -992,7 +984,6 @@ source "board/vpac270/Kconfig"
 source "board/wandboard/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/xaeniax/Kconfig"
-source "board/xilinx/zynq/Kconfig"
 source "board/zipitz2/Kconfig"
 
 endmenu
arch/arm/cpu/armv7/zynq/Kconfig new file +43 -0

43 lines not on this page · raw message

board/xilinx/zynq/Kconfig deleted +0 -95

95 lines not on this page · raw message

board/xilinx/zynq/MAINTAINERS +2 -10
index e167816..382e921 100644
@@ -3,13 +3,5 @@ M:	Michal Simek <[email protected]>
 M:	Jagannadha Sutradharudu Teki <[email protected]>
 S:	Maintained
 F:	board/xilinx/zynq/
-F:	include/configs/zynq_microzed.h
-F:	configs/zynq_microzed_defconfig
-F:	include/configs/zynq_zc70x.h
-F:	configs/zynq_zc70x_defconfig
-F:	include/configs/zynq_zc770.h
-F:	configs/zynq_zc770_xm010_defconfig
-F:	configs/zynq_zc770_xm012_defconfig
-F:	configs/zynq_zc770_xm013_defconfig
-F:	include/configs/zynq_zed.h
-F:	configs/zynq_zed_defconfig
+F:	include/configs/zynq*.h
+F:	configs/zynq_*_defconfig
configs/zynq_microzed_defconfig +1 -0
index 14024d0..3aedb35 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_MICROZED=y
configs/zynq_zc70x_defconfig +1 -0
index d2e79a5..04c8def 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_ZC70X=y
configs/zynq_zc770_xm010_defconfig +1 -0
index e9f9c4b..1178b40 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
 +S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_ZC770=y
configs/zynq_zc770_xm012_defconfig +1 -0
index 78f1fe6..52c2121 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
 +S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_ZC770=y
configs/zynq_zc770_xm013_defconfig +1 -0
index d96e8ff..836809a 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013"
 +S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_ZC770=y
configs/zynq_zed_defconfig +1 -0
index abf7e82..2337906 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_ZED=y
include/configs/zynq-common.h +0 -1
index d57e9d5..875cb43 100644
@@ -12,7 +12,6 @@
 
 /* High Level configuration Options */
 #define CONFIG_ARMV7
-#define CONFIG_ZYNQ
 
 /* CPU clock */
 #ifndef CONFIG_CPU_FREQ_HZ
Signature · 1 line
1.9.1
#4 lore raw

PATCH 3/15 tegra: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Tegra board select menu to tegra/Kconfig.

Insert the Tegra SoC select menu between the arch select and the board select.

Architecture select
|-- Tegra Platform (Tegra)
|- Tegra SoC select (Tegra20 / 30 / 114 / 124)
|- Board select

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="tegra*") and always "select" CONFIG_SPL as follows:

config TEGRA
bool
select SPL

Cc Stephen Warren <[email protected]>
Cc Tom Warren <[email protected]>

---

 arch/arm/Kconfig                           | 69 +++---------------------------
 arch/arm/cpu/armv7/tegra-common/Kconfig    | 30 +++++++++++++
 arch/arm/cpu/armv7/tegra114/Kconfig        | 17 ++++++++
 arch/arm/cpu/armv7/tegra124/Kconfig        | 21 +++++++++
 arch/arm/cpu/armv7/tegra20/Kconfig         | 53 +++++++++++++++++++++++
 arch/arm/cpu/armv7/tegra30/Kconfig         | 25 +++++++++++
 arch/arm/include/asm/arch-tegra114/tegra.h |  2 -
 arch/arm/include/asm/arch-tegra124/tegra.h |  2 -
 arch/arm/include/asm/arch-tegra20/tegra.h  |  2 -
 arch/arm/include/asm/arch-tegra30/tegra.h  |  2 -
 board/avionic-design/medcom-wide/Kconfig   |  9 ----
 board/avionic-design/plutux/Kconfig        |  9 ----
 board/avionic-design/tec-ng/Kconfig        |  9 ----
 board/avionic-design/tec/Kconfig           |  9 ----
 board/compal/paz00/Kconfig                 |  9 ----
 board/compulab/trimslice/Kconfig           |  9 ----
 board/nvidia/beaver/Kconfig                |  9 ----
 board/nvidia/cardhu/Kconfig                |  9 ----
 board/nvidia/dalmore/Kconfig               |  9 ----
 board/nvidia/harmony/Kconfig               |  9 ----
 board/nvidia/jetson-tk1/Kconfig            |  9 ----
 board/nvidia/seaboard/Kconfig              |  9 ----
 board/nvidia/venice2/Kconfig               |  9 ----
 board/nvidia/ventana/Kconfig               |  9 ----
 board/nvidia/whistler/Kconfig              |  9 ----
 board/toradex/colibri_t20_iris/Kconfig     |  9 ----
 configs/beaver_defconfig                   |  3 +-
 configs/cardhu_defconfig                   |  3 +-
 configs/colibri_t20_iris_defconfig         |  3 +-
 configs/dalmore_defconfig                  |  3 +-
 configs/harmony_defconfig                  |  3 +-
 configs/jetson-tk1_defconfig               |  3 +-
 configs/medcom-wide_defconfig              |  3 +-
 configs/paz00_defconfig                    |  3 +-
 configs/plutux_defconfig                   |  3 +-
 configs/seaboard_defconfig                 |  3 +-
 configs/tec-ng_defconfig                   |  3 +-
 configs/tec_defconfig                      |  3 +-
 configs/trimslice_defconfig                |  3 +-
 configs/venice2_defconfig                  |  3 +-
 configs/ventana_defconfig                  |  3 +-
 configs/whistler_defconfig                 |  3 +-
 include/configs/tegra-common.h             |  1 -
 43 files changed, 184 insertions(+), 232 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/tegra-common/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra114/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra124/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra20/Kconfig
 create mode 100644 arch/arm/cpu/armv7/tegra30/Kconfig
arch/arm/Kconfig +6 -63
index f4faffc..812e8af 100644
@@ -659,53 +659,9 @@ config TARGET_VF610TWR
 config ZYNQ
 	bool "Xilinx Zynq Platform"
 
-config TARGET_MEDCOM_WIDE
-	bool "Support medcom-wide"
-
-config TARGET_PLUTUX
-	bool "Support plutux"
-
-config TARGET_TEC
-	bool "Support tec"
-
-config TARGET_PAZ00
-	bool "Support paz00"
-
-config TARGET_TRIMSLICE
-	bool "Support trimslice"
-
-config TARGET_HARMONY
-	bool "Support harmony"
-
-config TARGET_SEABOARD
-	bool "Support seaboard"
-
-config TARGET_VENTANA
-	bool "Support ventana"
-
-config TARGET_WHISTLER
-	bool "Support whistler"
-
-config TARGET_COLIBRI_T20_IRIS
-	bool "Support colibri_t20_iris"
-
-config TARGET_TEC_NG
-	bool "Support tec-ng"
-
-config TARGET_BEAVER
-	bool "Support beaver"
-
-config TARGET_CARDHU
-	bool "Support cardhu"
-
-config TARGET_DALMORE
-	bool "Support dalmore"
-
-config TARGET_JETSON_TK1
-	bool "Support jetson-tk1"
-
-config TARGET_VENICE2
-	bool "Support venice2"
+config TEGRA
+	bool "NVIDIA Tegra"
+	select SPL
 
 config TARGET_VEXPRESS_AEMV8A
 	bool "Support vexpress_aemv8a"
@@ -760,7 +716,10 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/armv7/tegra-common/Kconfig"
+
 source "arch/arm/cpu/armv7/zynq/Kconfig"
+
 source "board/8dtech/eco5pk/Kconfig"
 source "board/Barix/ipam390/Kconfig"
 source "board/BuR/kwb/Kconfig"
@@ -802,10 +761,6 @@ source "board/atmel/at91sam9rlek/Kconfig"
 source "board/atmel/at91sam9x5ek/Kconfig"
 source "board/atmel/sama5d3_xplained/Kconfig"
 source "board/atmel/sama5d3xek/Kconfig"
-source "board/avionic-design/medcom-wide/Kconfig"
-source "board/avionic-design/plutux/Kconfig"
-source "board/avionic-design/tec-ng/Kconfig"
-source "board/avionic-design/tec/Kconfig"
 source "board/balloon3/Kconfig"
 source "board/barco/titanium/Kconfig"
 source "board/bluegiga/apx4devkit/Kconfig"
@@ -821,11 +776,9 @@ source "board/cloudengines/pogo_e02/Kconfig"
 source "board/cm4008/Kconfig"
 source "board/cm41xx/Kconfig"
 source "board/comelit/dig297/Kconfig"
-source "board/compal/paz00/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
 source "board/compulab/cm_t35/Kconfig"
 source "board/compulab/cm_t54/Kconfig"
-source "board/compulab/trimslice/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/corscience/tricorder/Kconfig"
 source "board/creative/xfi3/Kconfig"
@@ -896,15 +849,6 @@ source "board/logicpd/zoom1/Kconfig"
 source "board/matrix_vision/mvblx/Kconfig"
 source "board/mpl/vcma9/Kconfig"
 source "board/nokia/rx51/Kconfig"
-source "board/nvidia/beaver/Kconfig"
-source "board/nvidia/cardhu/Kconfig"
-source "board/nvidia/dalmore/Kconfig"
-source "board/nvidia/harmony/Kconfig"
-source "board/nvidia/jetson-tk1/Kconfig"
-source "board/nvidia/seaboard/Kconfig"
-source "board/nvidia/venice2/Kconfig"
-source "board/nvidia/ventana/Kconfig"
-source "board/nvidia/whistler/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
 source "board/omicron/calimain/Kconfig"
 source "board/overo/Kconfig"
@@ -976,7 +920,6 @@ source "board/ti/tnetv107xevm/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/timll/devkit8000/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
-source "board/toradex/colibri_t20_iris/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
arch/arm/cpu/armv7/tegra-common/Kconfig new file +30 -0
new file mode 100644
index 0000000..8e2153b
@@ -0,0 +1,30 @@
+if TEGRA
+
+choice
+	prompt "Tegra SoC select"
+
+config TEGRA20
+	bool "Tegra20 family"
+
+config TEGRA30
+	bool "Tegra30 family"
+
+config TEGRA114
+	bool "Tegra114 family"
+
+config TEGRA124
+	bool "Tegra124 family"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "arm720t" if SPL_BUILD
+	default "armv7" if !SPL_BUILD
+
+source "arch/arm/cpu/armv7/tegra20/Kconfig"
+source "arch/arm/cpu/armv7/tegra30/Kconfig"
+source "arch/arm/cpu/armv7/tegra114/Kconfig"
+source "arch/arm/cpu/armv7/tegra124/Kconfig"
+
+endif
arch/arm/cpu/armv7/tegra114/Kconfig new file +17 -0
new file mode 100644
index 0000000..2468c0b
@@ -0,0 +1,17 @@
+if TEGRA114
+
+choice
+	prompt "Tegra114 board select"
+
+config TARGET_DALMORE
+	bool "Dalmore board"
+
+endchoice
+
+config SYS_SOC
+	string
+	default "tegra114"
+
+source "board/nvidia/dalmore/Kconfig"
+
+endif
arch/arm/cpu/armv7/tegra124/Kconfig new file +21 -0
new file mode 100644
index 0000000..e770f7f
@@ -0,0 +1,21 @@
+if TEGRA124
+
+choice
+	prompt "Tegra124 board select"
+
+config TARGET_JETSON_TK1
+	bool "Jetson-tk1 board"
+
+config TARGET_VENICE2
+	bool "Venice2 board"
+
+endchoice
+
+config SYS_SOC
+	string
+	default "tegra124"
+
+source "board/nvidia/jetson-tk1/Kconfig"
+source "board/nvidia/venice2/Kconfig"
+
+endif
arch/arm/cpu/armv7/tegra20/Kconfig new file +53 -0

53 lines not on this page · raw message

arch/arm/cpu/armv7/tegra30/Kconfig new file +25 -0
new file mode 100644
index 0000000..8570e97
@@ -0,0 +1,25 @@
+if TEGRA30
+
+choice
+	prompt "Tegra30 board select"
+
+config TARGET_BEAVER
+	bool "Beaver board"
+
+config TARGET_CARDHU
+	bool "Cardhu board"
+
+config TARGET_TEC_NG
+	bool "Tec-ng board"
+
+endchoice
+
+config SYS_SOC
+	string
+	default "tegra30"
+
+source "board/nvidia/beaver/Kconfig"
+source "board/nvidia/cardhu/Kconfig"
+source "board/avionic-design/tec-ng/Kconfig"
+
+endif
arch/arm/include/asm/arch-tegra114/tegra.h +0 -2
index 705ca57..5d426b5 100644
@@ -17,8 +17,6 @@
 #ifndef _TEGRA114_H_
 #define _TEGRA114_H_
 
-#define CONFIG_TEGRA114
-
 #define NV_PA_SDRAM_BASE	0x80000000	/* 0x80000000 for real T114 */
 #define NV_PA_TSC_BASE		0x700F0000	/* System Counter TSC regs */
 
arch/arm/include/asm/arch-tegra124/tegra.h +0 -2
index 86ebd19..db3d837 100644
@@ -8,8 +8,6 @@
 #ifndef _TEGRA124_H_
 #define _TEGRA124_H_
 
-#define CONFIG_TEGRA124
-
 #define NV_PA_SDRAM_BASE	0x80000000
 #define NV_PA_TSC_BASE		0x700F0000	/* System Counter TSC regs */
 #define NV_PA_MC_BASE		0x70019000	/* Mem Ctlr regs (MCB, etc.) */
arch/arm/include/asm/arch-tegra20/tegra.h +0 -2
index 6a4b40e..18856ac 100644
@@ -8,8 +8,6 @@
 #ifndef _TEGRA20_H_
 #define _TEGRA20_H_
 
-#define CONFIG_TEGRA20
-
 #define NV_PA_SDRAM_BASE	0x00000000
 
 #include <asm/arch-tegra/tegra.h>
arch/arm/include/asm/arch-tegra30/tegra.h +0 -2
index 4ad8b1c..c02c5d8 100644
@@ -17,8 +17,6 @@
 #ifndef _TEGRA30_H_
 #define _TEGRA30_H_
 
-#define CONFIG_TEGRA30
-
 #define NV_PA_SDRAM_BASE	0x80000000	/* 0x80000000 for real T30 */
 
 #include <asm/arch-tegra/tegra.h>
board/avionic-design/medcom-wide/Kconfig +0 -9
index 2472fe2..16001e4 100644
@@ -1,10 +1,5 @@
 if TARGET_MEDCOM_WIDE
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "medcom-wide"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "medcom-wide"
board/avionic-design/plutux/Kconfig +0 -9
index a697a54..c9a90247 100644
@@ -1,10 +1,5 @@
 if TARGET_PLUTUX
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "plutux"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "plutux"
board/avionic-design/tec-ng/Kconfig +0 -9
index f52edda..e6b69e8 100644
@@ -1,10 +1,5 @@
 if TARGET_TEC_NG
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "tec-ng"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra30"
-
 config SYS_CONFIG_NAME
 	string
 	default "tec-ng"
board/avionic-design/tec/Kconfig +0 -9
index d19e3f4..fbf7f46 100644
@@ -1,10 +1,5 @@
 if TARGET_TEC
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "tec"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "avionic-design"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "tec"
board/compal/paz00/Kconfig +0 -9
index 4f0f09f..690d7a7 100644
@@ -1,10 +1,5 @@
 if TARGET_PAZ00
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "paz00"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "compal"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "paz00"
board/compulab/trimslice/Kconfig +0 -9
index e545f0c..6ae030c 100644
@@ -1,10 +1,5 @@
 if TARGET_TRIMSLICE
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "trimslice"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "compulab"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "trimslice"
board/nvidia/beaver/Kconfig +0 -9
index f052676..e487b66 100644
@@ -1,10 +1,5 @@
 if TARGET_BEAVER
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "beaver"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra30"
-
 config SYS_CONFIG_NAME
 	string
 	default "beaver"
board/nvidia/cardhu/Kconfig +0 -9
index 9853114..150815f 100644
@@ -1,10 +1,5 @@
 if TARGET_CARDHU
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "cardhu"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra30"
-
 config SYS_CONFIG_NAME
 	string
 	default "cardhu"
board/nvidia/dalmore/Kconfig +0 -9
index 33b78db..9eed19c 100644
@@ -1,10 +1,5 @@
 if TARGET_DALMORE
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "dalmore"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra114"
-
 config SYS_CONFIG_NAME
 	string
 	default "dalmore"
board/nvidia/harmony/Kconfig +0 -9
index 2a3bde4..7d75f2d 100644
@@ -1,10 +1,5 @@
 if TARGET_HARMONY
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "harmony"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "harmony"
board/nvidia/jetson-tk1/Kconfig +0 -9
index 22b4c69..02b46b7 100644
@@ -1,10 +1,5 @@
 if TARGET_JETSON_TK1
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "jetson-tk1"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra124"
-
 config SYS_CONFIG_NAME
 	string
 	default "jetson-tk1"
board/nvidia/seaboard/Kconfig +0 -9
index 39c65b5..7863702 100644
@@ -1,10 +1,5 @@
 if TARGET_SEABOARD
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "seaboard"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "seaboard"
board/nvidia/venice2/Kconfig +0 -9
index 84a7160..993da79 100644
@@ -1,10 +1,5 @@
 if TARGET_VENICE2
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "venice2"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra124"
-
 config SYS_CONFIG_NAME
 	string
 	default "venice2"
board/nvidia/ventana/Kconfig +0 -9
index 59e85c4..95840a8 100644
@@ -1,10 +1,5 @@
 if TARGET_VENTANA
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "ventana"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "ventana"
board/nvidia/whistler/Kconfig +0 -9
index f025413..113e2ef 100644
@@ -1,10 +1,5 @@
 if TARGET_WHISTLER
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "whistler"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nvidia"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "whistler"
board/toradex/colibri_t20_iris/Kconfig +0 -9
index 334b7e0..cccdd58 100644
@@ -1,10 +1,5 @@
 if TARGET_COLIBRI_T20_IRIS
 
-config SYS_CPU
-	string
-	default "arm720t" if SPL_BUILD
-	default "armv7" if !SPL_BUILD
-
 config SYS_BOARD
 	string
 	default "colibri_t20_iris"
@@ -13,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "toradex"
 
-config SYS_SOC
-	string
-	default "tegra20"
-
 config SYS_CONFIG_NAME
 	string
 	default "colibri_t20_iris"
configs/beaver_defconfig +2 -1
index 0e70f25..7c9d94b 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_BEAVER=y
configs/cardhu_defconfig +2 -1
index 564ad5a..bb042b4 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_CARDHU=y
configs/colibri_t20_iris_defconfig +2 -1
index 8ff2464..b2a21e1 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_COLIBRI_T20_IRIS=y
configs/dalmore_defconfig +2 -1
index 288b238..70677aa 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA114=y
 +S:CONFIG_TARGET_DALMORE=y
configs/harmony_defconfig +2 -1
index d25ea5c..a52231b 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_HARMONY=y
configs/jetson-tk1_defconfig +2 -1
index 6926257..00eac92 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA124=y
 +S:CONFIG_TARGET_JETSON_TK1=y
configs/medcom-wide_defconfig +2 -1
index ddf3437..e9a3930 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_MEDCOM_WIDE=y
configs/paz00_defconfig +2 -1
index 61a536e..05974eb 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_PAZ00=y
configs/plutux_defconfig +2 -1
index 672b66c..60e80ff 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_PLUTUX=y
configs/seaboard_defconfig +2 -1
index c0f078b..516e760 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_SEABOARD=y
configs/tec-ng_defconfig +2 -1
index 2360d25..e4a31cc 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_TEC_NG=y
configs/tec_defconfig +2 -1
index 1aaa9d1..62a9542 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_TEC=y
configs/trimslice_defconfig +2 -1
index c096c65..94f23e3 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_TRIMSLICE=y
configs/venice2_defconfig +2 -1
index 2bfa91d..dfc5407 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA124=y
 +S:CONFIG_TARGET_VENICE2=y
configs/ventana_defconfig +2 -1
index 75fca96..845e241 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_VENTANA=y
configs/whistler_defconfig +2 -1
index cdc2c90..8c07c18 100644
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_WHISTLER=y
include/configs/tegra-common.h +0 -1
index 717cd61..d27fceb 100644
@@ -14,7 +14,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_ARMCORTEXA9		/* This is an ARM V7 CPU core */
-#define CONFIG_TEGRA			/* which is a Tegra generic machine */
 #define CONFIG_SYS_L2CACHE_OFF		/* No L2 cache */
 
 #include <asm/arch/tegra.h>		/* get chip and board defs */
Signature · 1 line
1.9.1
#5 lore raw

PATCH 3/15 tegra: kconfig: move board select menu and common settings

Quoted 11 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Tegra board select menu to tegra/Kconfig.

Insert the Tegra SoC select menu between the arch select and the board select.

Architecture select
|-- Tegra Platform (Tegra)
|- Tegra SoC select (Tegra20 / 30 / 114 / 124)
|- Board select

Quoted 6 lines

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="tegra*") and always "select" CONFIG_SPL as follows:

config TEGRA
bool
select SPL

I briefly scanned this and it looks reasonable to me.

BTW, what's the "+S:CONFIG_TEGRA=y" syntax in the defconfig files? I don't recall seeing that in the kernel, where *_defconfig are generated by "make savedefconfig", and only contain lines saying "CONFIG_TEGRA=y" without the "+S:" prefix.

#6 lore raw

PATCH 3/15 tegra: kconfig: move board select menu and common settings

Hi Stephen,

Quoted 19 lines · On Mon, 04 Aug 2014 12:12:56 -0600 Stephen Warren <[email protected]> wrote:
Quoted 11 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Tegra board select menu to tegra/Kconfig.

Insert the Tegra SoC select menu between the arch select and the board select.

Architecture select
|-- Tegra Platform (Tegra)
|- Tegra SoC select (Tegra20 / 30 / 114 / 124)
|- Board select

Quoted 6 lines

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="tegra*") and always "select" CONFIG_SPL as follows:

config TEGRA
bool
select SPL

Quoted 5 lines

I briefly scanned this and it looks reasonable to me.

BTW, what's the "+S:CONFIG_TEGRA=y" syntax in the defconfig files? I don't recall seeing that in the kernel, where *_defconfig are generated by "make savedefconfig", and only contain lines saying "CONFIG_TEGRA=y" without the "+S:" prefix.

The defconfig syntax is special for U-Boot.

"+S:CONFIG_TEGRA=y" means
"CONFIG_TEGRA=y" is defined in SPL as well as in the normal image.

I chose to use prefixes such "+S:"
instead of haveing multiple defconfigs per board.

(IIRC, you mentioned you do not like to duplicate CONFIG_ARM=y or CONFIG_TEGRA=y in beaver_defconfig and beaver_spl_defconfig.)

Best Regards
Masahiro Yamada

#7 lore raw

PATCH 4/15 rmobile: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Rmobile board select menu to rmobile/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="rmobile").

Cc Nobuhiro Iwamatsu <[email protected]>

---

 arch/arm/Kconfig                             | 23 +++--------------
 arch/arm/cpu/armv7/rmobile/Kconfig           | 37 ++++++++++++++++++++++++++++
 board/atmark-techno/armadillo-800eva/Kconfig |  8 ------
 board/kmc/kzm9g/Kconfig                      |  8 ------
 board/renesas/alt/Kconfig                    |  8 ------
 board/renesas/koelsch/Kconfig                |  8 ------
 board/renesas/lager/Kconfig                  |  8 ------
 configs/alt_defconfig                        |  1 +
 configs/armadillo-800eva_defconfig           |  1 +
 configs/koelsch_defconfig                    |  1 +
 configs/kzm9g_defconfig                      |  1 +
 configs/lager_defconfig                      |  1 +
 include/configs/alt.h                        |  1 -
 include/configs/armadillo-800eva.h           |  1 -
 include/configs/koelsch.h                    |  1 -
 include/configs/kzm9g.h                      |  1 -
 include/configs/lager.h                      |  1 -
 17 files changed, 46 insertions(+), 64 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/rmobile/Kconfig
arch/arm/Kconfig +4 -19
index 812e8af..a288ee1 100644
@@ -614,20 +614,8 @@ config TARGET_DRA7XX_EVM
 config TARGET_OMAP5_UEVM
 	bool "Support omap5_uevm"
 
-config TARGET_ARMADILLO_800EVA
-	bool "Support armadillo-800eva"
-
-config TARGET_KZM9G
-	bool "Support kzm9g"
-
-config TARGET_ALT
-	bool "Support alt"
-
-config TARGET_KOELSCH
-	bool "Support koelsch"
-
-config TARGET_LAGER
-	bool "Support lager"
+config RMOBILE
+	bool "Renesas ARM SoCs"
 
 config TARGET_S5P_GONI
 	bool "Support s5p_goni"
@@ -716,6 +704,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/armv7/rmobile/Kconfig"
+
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
 
 source "arch/arm/cpu/armv7/zynq/Kconfig"
@@ -750,7 +740,6 @@ source "board/armltd/integrator/Kconfig"
 source "board/armltd/versatile/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
-source "board/atmark-techno/armadillo-800eva/Kconfig"
 source "board/atmel/at91rm9200ek/Kconfig"
 source "board/atmel/at91sam9260ek/Kconfig"
 source "board/atmel/at91sam9261ek/Kconfig"
@@ -840,7 +829,6 @@ source "board/jornada/Kconfig"
 source "board/karo/tk71/Kconfig"
 source "board/karo/tx25/Kconfig"
 source "board/keymile/km_arm/Kconfig"
-source "board/kmc/kzm9g/Kconfig"
 source "board/logicpd/am3517evm/Kconfig"
 source "board/logicpd/imx27lite/Kconfig"
 source "board/logicpd/imx31_litekit/Kconfig"
@@ -861,9 +849,6 @@ source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
 source "board/raidsonic/ib62x0/Kconfig"
 source "board/raspberrypi/rpi_b/Kconfig"
-source "board/renesas/alt/Kconfig"
-source "board/renesas/koelsch/Kconfig"
-source "board/renesas/lager/Kconfig"
 source "board/ronetix/pm9261/Kconfig"
 source "board/ronetix/pm9263/Kconfig"
 source "board/ronetix/pm9g45/Kconfig"
arch/arm/cpu/armv7/rmobile/Kconfig new file +37 -0
new file mode 100644
index 0000000..55c620a
@@ -0,0 +1,37 @@
+if RMOBILE
+
+choice
+	prompt "Renesus ARM SoCs board select"
+
+config TARGET_ARMADILLO_800EVA
+	bool "armadillo 800 eva board"
+
+config TARGET_KOELSCH
+	bool "Koelsch board"
+
+config TARGET_LAGER
+	bool "Lager board"
+
+config TARGET_KZM9G
+	bool "KZM9D board"
+
+config TARGET_ALT
+	bool "Alt board"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_SOC
+	string
+	default "rmobile"
+
+source "board/atmark-techno/armadillo-800eva/Kconfig"
+source "board/renesas/koelsch/Kconfig"
+source "board/renesas/lager/Kconfig"
+source "board/kmc/kzm9g/Kconfig"
+source "board/renesas/alt/Kconfig"
+
+endif
board/atmark-techno/armadillo-800eva/Kconfig +0 -8
index c8f89fe..3365c7b 100644
@@ -1,9 +1,5 @@
 if TARGET_ARMADILLO_800EVA
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "armadillo-800eva"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "atmark-techno"
 
-config SYS_SOC
-	string
-	default "rmobile"
-
 config SYS_CONFIG_NAME
 	string
 	default "armadillo-800eva"
board/kmc/kzm9g/Kconfig +0 -8
index 2d40173..ab4812f 100644
@@ -1,9 +1,5 @@
 if TARGET_KZM9G
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "kzm9g"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "kmc"
 
-config SYS_SOC
-	string
-	default "rmobile"
-
 config SYS_CONFIG_NAME
 	string
 	default "kzm9g"
board/renesas/alt/Kconfig +0 -8
index d317025..dc01a38 100644
@@ -1,9 +1,5 @@
 if TARGET_ALT
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "alt"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "renesas"
 
-config SYS_SOC
-	string
-	default "rmobile"
-
 config SYS_CONFIG_NAME
 	string
 	default "alt"
board/renesas/koelsch/Kconfig +0 -8
index 0def847..e7c6437 100644
@@ -1,9 +1,5 @@
 if TARGET_KOELSCH
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "koelsch"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "renesas"
 
-config SYS_SOC
-	string
-	default "rmobile"
-
 config SYS_CONFIG_NAME
 	string
 	default "koelsch"
board/renesas/lager/Kconfig +0 -8
index e88f4f6..07dc98c 100644
@@ -1,9 +1,5 @@
 if TARGET_LAGER
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "lager"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "renesas"
 
-config SYS_SOC
-	string
-	default "rmobile"
-
 config SYS_CONFIG_NAME
 	string
 	default "lager"
configs/alt_defconfig +1 -0
index 11a1c89..0655e60 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_ALT=y
configs/armadillo-800eva_defconfig +1 -0
index 081c88a..9b17895 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_ARMADILLO_800EVA=y
configs/koelsch_defconfig +1 -0
index d63a286..d59ff3d 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_KOELSCH=y
configs/kzm9g_defconfig +1 -0
index aaddf82..d4d340f 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_KZM9G=y
configs/lager_defconfig +1 -0
index bf1be72..9a32d6b 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
 CONFIG_TARGET_LAGER=y
include/configs/alt.h +0 -1
index 9eec4bc..7238f68 100644
@@ -13,7 +13,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7794
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Alt"
 #define CONFIG_SH_GPIO_PFC
 
include/configs/armadillo-800eva.h +0 -1
index 8bb932c..b073b97 100644
@@ -12,7 +12,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7740
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n"
 #define CONFIG_SH_GPIO_PFC
 
include/configs/koelsch.h +0 -1
index 6795f28..ffb1c3b 100644
@@ -12,7 +12,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7791
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Koelsch"
 #define CONFIG_SH_GPIO_PFC
 
include/configs/kzm9g.h +0 -1
index 5a13ad1..ac74ae7 100644
@@ -10,7 +10,6 @@
 
 #undef DEBUG
 
-#define CONFIG_RMOBILE
 #define CONFIG_SH73A0
 #define CONFIG_KZM_A9_GT
 #define CONFIG_RMOBILE_BOARD_STRING	"KMC KZM-A9-GT"
include/configs/lager.h +0 -1
index f39a788..8ec268b 100644
@@ -13,7 +13,6 @@
 #undef DEBUG
 #define CONFIG_ARMV7
 #define CONFIG_R8A7790
-#define CONFIG_RMOBILE
 #define CONFIG_RMOBILE_BOARD_STRING "Lager"
 #define CONFIG_SH_GPIO_PFC
 
Signature · 1 line
1.9.1
#8 lore raw

PATCH 5/15 versatile: kconfig: move common settings

In reply to Masahiro Yamada

Move Versatile-specific settings versatile/Kconfig.

---

 arch/arm/Kconfig                         | 13 ++----
 arch/arm/cpu/arm926ejs/versatile/Kconfig | 23 +++++++++++
 board/armltd/versatile/Kconfig           | 71 --------------------------------
 configs/versatileab_defconfig            |  2 +-
 configs/versatilepb_defconfig            |  2 +-
 configs/versatileqemu_defconfig          |  2 +-
 6 files changed, 30 insertions(+), 83 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/versatile/Kconfig
 delete mode 100644 board/armltd/versatile/Kconfig
arch/arm/Kconfig +4 -9
index a288ee1..955fce8 100644
@@ -308,14 +308,8 @@ config TARGET_SPEAR600
 config TARGET_X600
 	bool "Support x600"
 
-config TARGET_VERSATILEAB
-	bool "Support versatileab"
-
-config TARGET_VERSATILEPB
-	bool "Support versatilepb"
-
-config TARGET_VERSATILEQEMU
-	bool "Support versatileqemu"
+config ARCH_VERSATILE
+	bool "ARM Ltd. Versatile family"
 
 config TARGET_INTEGRATORCP_CM1136
 	bool "Support integratorcp_cm1136"
@@ -708,6 +702,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
+
 source "arch/arm/cpu/armv7/zynq/Kconfig"
 
 source "board/8dtech/eco5pk/Kconfig"
@@ -737,7 +733,6 @@ source "board/ait/cam_enc_4xx/Kconfig"
 source "board/altera/socfpga/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/integrator/Kconfig"
-source "board/armltd/versatile/Kconfig"
 source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/atmel/at91rm9200ek/Kconfig"
arch/arm/cpu/arm926ejs/versatile/Kconfig new file +23 -0
new file mode 100644
index 0000000..fc29c98
@@ -0,0 +1,23 @@
+if ARCH_VERSATILE
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_BOARD
+	string
+	default "versatile"
+
+config SYS_VENDOR
+	string
+	default "armltd"
+
+config SYS_SOC
+	string
+	default "versatile"
+
+config SYS_CONFIG_NAME
+	string
+	default "versatile"
+
+endif
board/armltd/versatile/Kconfig deleted +0 -71

71 lines not on this page · raw message

configs/versatileab_defconfig +1 -1
index 9d64dd0..94680fe 100644
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
 CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEAB=y
+CONFIG_ARCH_VERSATILE=y
configs/versatilepb_defconfig +1 -1
index fadaf93..2c59e5c 100644
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
 CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEPB=y
+CONFIG_ARCH_VERSATILE=y
configs/versatileqemu_defconfig +1 -1
index 9d24558..fb0485d 100644
@@ -1,3 +1,3 @@
 CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB"
 CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEQEMU=y
+CONFIG_ARCH_VERSATILE=y
Signature · 1 line
1.9.1
#9 lore raw

PATCH 6/15 kirkwood: kconfig: refactor Kconfig and defconfig

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the KirkWood board select menu to kirkwood/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="kirkwood").

Cc Prafulla Wadaskar <[email protected]>

---

 arch/arm/Kconfig                        | 75 ++-------------------------
 arch/arm/cpu/arm926ejs/kirkwood/Kconfig | 89 +++++++++++++++++++++++++++++++++
 board/LaCie/net2big_v2/Kconfig          |  8 ---
 board/LaCie/netspace_v2/Kconfig         |  8 ---
 board/LaCie/wireless_space/Kconfig      |  8 ---
 board/Marvell/dreamplug/Kconfig         |  8 ---
 board/Marvell/guruplug/Kconfig          |  8 ---
 board/Marvell/mv88f6281gtw_ge/Kconfig   |  8 ---
 board/Marvell/openrd/Kconfig            |  8 ---
 board/Marvell/rd6281a/Kconfig           |  8 ---
 board/Marvell/sheevaplug/Kconfig        |  8 ---
 board/Seagate/dockstar/Kconfig          |  8 ---
 board/Seagate/goflexhome/Kconfig        |  8 ---
 board/buffalo/lsxl/Kconfig              |  8 ---
 board/cloudengines/pogo_e02/Kconfig     |  8 ---
 board/d-link/dns325/Kconfig             |  8 ---
 board/iomega/iconnect/Kconfig           |  8 ---
 board/karo/tk71/Kconfig                 |  8 ---
 board/keymile/km_arm/Kconfig            |  8 ---
 board/raidsonic/ib62x0/Kconfig          |  8 ---
 configs/d2net_v2_defconfig              |  1 +
 configs/dns325_defconfig                |  1 +
 configs/dockstar_defconfig              |  1 +
 configs/dreamplug_defconfig             |  1 +
 configs/goflexhome_defconfig            |  1 +
 configs/guruplug_defconfig              |  1 +
 configs/ib62x0_defconfig                |  1 +
 configs/iconnect_defconfig              |  1 +
 configs/inetspace_v2_defconfig          |  1 +
 configs/km_kirkwood_128m16_defconfig    |  1 +
 configs/km_kirkwood_defconfig           |  1 +
 configs/km_kirkwood_pci_defconfig       |  1 +
 configs/kmcoge5un_defconfig             |  1 +
 configs/kmnusa_defconfig                |  1 +
 configs/kmsugp1_defconfig               |  1 +
 configs/kmsuv31_defconfig               |  1 +
 configs/lschlv2_defconfig               |  1 +
 configs/lsxhl_defconfig                 |  1 +
 configs/mgcoge3un_defconfig             |  1 +
 configs/mv88f6281gtw_ge_defconfig       |  1 +
 configs/net2big_v2_defconfig            |  1 +
 configs/netspace_lite_v2_defconfig      |  1 +
 configs/netspace_max_v2_defconfig       |  1 +
 configs/netspace_mini_v2_defconfig      |  1 +
 configs/netspace_v2_defconfig           |  1 +
 configs/openrd_base_defconfig           |  1 +
 configs/openrd_client_defconfig         |  1 +
 configs/openrd_ultimate_defconfig       |  1 +
 configs/pogo_e02_defconfig              |  1 +
 configs/portl2_defconfig                |  1 +
 configs/rd6281a_defconfig               |  1 +
 configs/sheevaplug_defconfig            |  1 +
 configs/tk71_defconfig                  |  1 +
 configs/wireless_space_defconfig        |  1 +
 include/configs/dns325.h                |  1 -
 include/configs/dockstar.h              |  1 -
 include/configs/dreamplug.h             |  1 -
 include/configs/goflexhome.h            |  1 -
 include/configs/guruplug.h              |  1 -
 include/configs/ib62x0.h                |  1 -
 include/configs/iconnect.h              |  1 -
 include/configs/km/km_arm.h             |  1 -
 include/configs/lacie_kw.h              |  1 -
 include/configs/lsxl.h                  |  1 -
 include/configs/mv88f6281gtw_ge.h       |  1 -
 include/configs/openrd.h                |  1 -
 include/configs/pogo_e02.h              |  1 -
 include/configs/rd6281a.h               |  1 -
 include/configs/sheevaplug.h            |  1 -
 include/configs/tk71.h                  |  1 -
 include/configs/wireless_space.h        |  1 -
 71 files changed, 127 insertions(+), 232 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/kirkwood/Kconfig
arch/arm/Kconfig +4 -71
index 955fce8..43d0ce5 100644
@@ -179,59 +179,8 @@ config TARGET_ENBW_CMC
 config TARGET_CALIMAIN
 	bool "Support calimain"
 
-config TARGET_LSXL
-	bool "Support lsxl"
-
-config TARGET_POGO_E02
-	bool "Support pogo_e02"
-
-config TARGET_DNS325
-	bool "Support dns325"
-
-config TARGET_ICONNECT
-	bool "Support iconnect"
-
-config TARGET_TK71
-	bool "Support tk71"
-
-config TARGET_KM_KIRKWOOD
-	bool "Support km_kirkwood"
-
-config TARGET_NET2BIG_V2
-	bool "Support net2big_v2"
-
-config TARGET_NETSPACE_V2
-	bool "Support netspace_v2"
-
-config TARGET_WIRELESS_SPACE
-	bool "Support wireless_space"
-
-config TARGET_DREAMPLUG
-	bool "Support dreamplug"
-
-config TARGET_GURUPLUG
-	bool "Support guruplug"
-
-config TARGET_MV88F6281GTW_GE
-	bool "Support mv88f6281gtw_ge"
-
-config TARGET_OPENRD
-	bool "Support openrd"
-
-config TARGET_RD6281A
-	bool "Support rd6281a"
-
-config TARGET_SHEEVAPLUG
-	bool "Support sheevaplug"
-
-config TARGET_IB62X0
-	bool "Support ib62x0"
-
-config TARGET_DOCKSTAR
-	bool "Support dockstar"
-
-config TARGET_GOFLEXHOME
-	bool "Support goflexhome"
+config KIRKWOOD
+	bool "Marvell Kirkwood"
 
 config TARGET_DEVKIT3250
 	bool "Support devkit3250"
@@ -698,6 +647,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -714,20 +665,9 @@ source "board/BuS/eb_cpux9k2/Kconfig"
 source "board/BuS/vl_ma2sc/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
 source "board/LaCie/edminiv2/Kconfig"
-source "board/LaCie/net2big_v2/Kconfig"
-source "board/LaCie/netspace_v2/Kconfig"
-source "board/LaCie/wireless_space/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/dkb/Kconfig"
-source "board/Marvell/dreamplug/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
-source "board/Marvell/guruplug/Kconfig"
-source "board/Marvell/mv88f6281gtw_ge/Kconfig"
-source "board/Marvell/openrd/Kconfig"
-source "board/Marvell/rd6281a/Kconfig"
-source "board/Marvell/sheevaplug/Kconfig"
-source "board/Seagate/dockstar/Kconfig"
-source "board/Seagate/goflexhome/Kconfig"
 source "board/afeb9260/Kconfig"
 source "board/ait/cam_enc_4xx/Kconfig"
 source "board/altera/socfpga/Kconfig"
@@ -751,12 +691,10 @@ source "board/bluegiga/apx4devkit/Kconfig"
 source "board/bluewater/snapper9260/Kconfig"
 source "board/boundary/nitrogen6x/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
-source "board/buffalo/lsxl/Kconfig"
 source "board/calao/sbc35_a9g20/Kconfig"
 source "board/calao/tny_a9260/Kconfig"
 source "board/calao/usb_a9263/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
-source "board/cloudengines/pogo_e02/Kconfig"
 source "board/cm4008/Kconfig"
 source "board/cm41xx/Kconfig"
 source "board/comelit/dig297/Kconfig"
@@ -766,7 +704,6 @@ source "board/compulab/cm_t54/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/corscience/tricorder/Kconfig"
 source "board/creative/xfi3/Kconfig"
-source "board/d-link/dns325/Kconfig"
 source "board/davedenx/qong/Kconfig"
 source "board/davinci/da8xxevm/Kconfig"
 source "board/davinci/dm355evm/Kconfig"
@@ -817,13 +754,10 @@ source "board/highbank/Kconfig"
 source "board/htkw/mcx/Kconfig"
 source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
-source "board/iomega/iconnect/Kconfig"
 source "board/isee/igep0033/Kconfig"
 source "board/isee/igep00x0/Kconfig"
 source "board/jornada/Kconfig"
-source "board/karo/tk71/Kconfig"
 source "board/karo/tx25/Kconfig"
-source "board/keymile/km_arm/Kconfig"
 source "board/logicpd/am3517evm/Kconfig"
 source "board/logicpd/imx27lite/Kconfig"
 source "board/logicpd/imx31_litekit/Kconfig"
@@ -842,7 +776,6 @@ source "board/pandora/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
-source "board/raidsonic/ib62x0/Kconfig"
 source "board/raspberrypi/rpi_b/Kconfig"
 source "board/ronetix/pm9261/Kconfig"
 source "board/ronetix/pm9263/Kconfig"
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +89 -0

89 lines not on this page · raw message

board/LaCie/net2big_v2/Kconfig +0 -8
index 867d0d3..e8eb9ad 100644
@@ -1,9 +1,5 @@
 if TARGET_NET2BIG_V2
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "net2big_v2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "LaCie"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "lacie_kw"
board/LaCie/netspace_v2/Kconfig +0 -8
index fb6fbef..6242a42 100644
@@ -1,9 +1,5 @@
 if TARGET_NETSPACE_V2
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "netspace_v2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "LaCie"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "lacie_kw"
board/LaCie/wireless_space/Kconfig +0 -8
index 4815cde..ea6850f 100644
@@ -1,9 +1,5 @@
 if TARGET_WIRELESS_SPACE
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "wireless_space"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "LaCie"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "wireless_space"
board/Marvell/dreamplug/Kconfig +0 -8
index e067318..afaddf4 100644
@@ -1,9 +1,5 @@
 if TARGET_DREAMPLUG
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dreamplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Marvell"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "dreamplug"
board/Marvell/guruplug/Kconfig +0 -8
index fce8562..0b10e9f 100644
@@ -1,9 +1,5 @@
 if TARGET_GURUPLUG
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "guruplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Marvell"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "guruplug"
board/Marvell/mv88f6281gtw_ge/Kconfig +0 -8
index 17adab0..49654fe 100644
@@ -1,9 +1,5 @@
 if TARGET_MV88F6281GTW_GE
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "mv88f6281gtw_ge"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Marvell"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "mv88f6281gtw_ge"
board/Marvell/openrd/Kconfig +0 -8
index 2dfed34..7032ba5 100644
@@ -1,9 +1,5 @@
 if TARGET_OPENRD
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "openrd"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Marvell"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "openrd"
board/Marvell/rd6281a/Kconfig +0 -8
index ae753b0..e8702a7 100644
@@ -1,9 +1,5 @@
 if TARGET_RD6281A
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "rd6281a"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Marvell"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "rd6281a"
board/Marvell/sheevaplug/Kconfig +0 -8
index 6f3eb38..1c24d24 100644
@@ -1,9 +1,5 @@
 if TARGET_SHEEVAPLUG
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "sheevaplug"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Marvell"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "sheevaplug"
board/Seagate/dockstar/Kconfig +0 -8
index 4696ac6..13ea620 100644
@@ -1,9 +1,5 @@
 if TARGET_DOCKSTAR
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dockstar"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Seagate"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "dockstar"
board/Seagate/goflexhome/Kconfig +0 -8
index 0f918cb..2fb14ef 100644
@@ -1,9 +1,5 @@
 if TARGET_GOFLEXHOME
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "goflexhome"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Seagate"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "goflexhome"
board/buffalo/lsxl/Kconfig +0 -8
index 99f7b7c..50a620e 100644
@@ -1,9 +1,5 @@
 if TARGET_LSXL
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "lsxl"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "buffalo"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "lsxl"
board/cloudengines/pogo_e02/Kconfig +0 -8
index 149a1a2..fe36314 100644
@@ -1,9 +1,5 @@
 if TARGET_POGO_E02
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "pogo_e02"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "cloudengines"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "pogo_e02"
board/d-link/dns325/Kconfig +0 -8
index dea6071..763f93c 100644
@@ -1,9 +1,5 @@
 if TARGET_DNS325
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dns325"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "d-link"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "dns325"
board/iomega/iconnect/Kconfig +0 -8
index 8ac21d2..f75c06b 100644
@@ -1,9 +1,5 @@
 if TARGET_ICONNECT
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "iconnect"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "iomega"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "iconnect"
board/karo/tk71/Kconfig +0 -8
index 546491b..24071f6 100644
@@ -1,9 +1,5 @@
 if TARGET_TK71
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "tk71"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "karo"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "tk71"
board/keymile/km_arm/Kconfig +0 -8
index dec4626..3e9cddb 100644
@@ -1,9 +1,5 @@
 if TARGET_KM_KIRKWOOD
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "km_arm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "keymile"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "km_kirkwood"
board/raidsonic/ib62x0/Kconfig +0 -8
index 1e667c4..c0c3a93 100644
@@ -1,9 +1,5 @@
 if TARGET_IB62X0
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "ib62x0"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "raidsonic"
 
-config SYS_SOC
-	string
-	default "kirkwood"
-
 config SYS_CONFIG_NAME
 	string
 	default "ib62x0"
configs/d2net_v2_defconfig +1 -0
index e53aed7..c459f4d 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y
configs/dns325_defconfig +1 -0
index 6a18d2a..cc4a03b 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DNS325=y
configs/dockstar_defconfig +1 -0
index 528669e..b773cde 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DOCKSTAR=y
configs/dreamplug_defconfig +1 -0
index 49de210..45113c8 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_DREAMPLUG=y
configs/goflexhome_defconfig +1 -0
index 10fde53..276489b 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GOFLEXHOME=y
configs/guruplug_defconfig +1 -0
index f5be577..912a089 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_GURUPLUG=y
configs/ib62x0_defconfig +1 -0
index d92217e..b6780c5 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_IB62X0=y
configs/iconnect_defconfig +1 -0
index ab83fa6..7ff8d67 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_ICONNECT=y
configs/inetspace_v2_defconfig +1 -0
index 26d9932..1123b52 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
configs/km_kirkwood_128m16_defconfig +1 -0
index c51fbf3..6a263a6 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/km_kirkwood_defconfig +1 -0
index 4f554f7..aff76e5 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/km_kirkwood_pci_defconfig +1 -0
index abb42c9..13c70a7 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/kmcoge5un_defconfig +1 -0
index 0378277..78057e4 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/kmnusa_defconfig +1 -0
index 46ddbcd..d125c52 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/kmsugp1_defconfig +1 -0
index 183b365..d40dfd9 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/kmsuv31_defconfig +1 -0
index 9434ef0..40d0993 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/lschlv2_defconfig +1 -0
index 330b4d7..8c02fb3 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y
configs/lsxhl_defconfig +1 -0
index e8cdf8a..86845d1 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_LSXL=y
configs/mgcoge3un_defconfig +1 -0
index bc1e2ba..da991aa 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/mv88f6281gtw_ge_defconfig +1 -0
index 4e26879..0650032 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_MV88F6281GTW_GE=y
configs/net2big_v2_defconfig +1 -0
index bffea60..7422fbe 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NET2BIG_V2=y
configs/netspace_lite_v2_defconfig +1 -0
index b262152..6a3a32f 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
configs/netspace_max_v2_defconfig +1 -0
index 4fc84fc..903d6c9 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
configs/netspace_mini_v2_defconfig +1 -0
index 631a31b..774faa7 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
configs/netspace_v2_defconfig +1 -0
index dd77bfe..776fc04 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_NETSPACE_V2=y
configs/openrd_base_defconfig +1 -0
index 25f777e..7b3ea99 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
configs/openrd_client_defconfig +1 -0
index ba71851..d34793d 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
configs/openrd_ultimate_defconfig +1 -0
index 8651f92..4e10d4d 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_OPENRD=y
configs/pogo_e02_defconfig +1 -0
index 41637e0..97effef 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_POGO_E02=y
configs/portl2_defconfig +1 -0
index 6df18e9..1895c80 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_KM_KIRKWOOD=y
configs/rd6281a_defconfig +1 -0
index d9c3e39..ed083bf 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_RD6281A=y
configs/sheevaplug_defconfig +1 -0
index 9e4b9c9..d22b006 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_SHEEVAPLUG=y
configs/tk71_defconfig +1 -0
index ffff874..411e3c1 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_TK71=y
configs/wireless_space_defconfig +1 -0
index 6c78548..580e5ce 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
 CONFIG_TARGET_WIRELESS_SPACE=y
include/configs/dns325.h +0 -1
index 96db44f..eaf8c85 100644
@@ -24,7 +24,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SOC Family Name */
 #define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
include/configs/dockstar.h +0 -1
index d66bd2a..46a42b3 100644
@@ -21,7 +21,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_DOCKSTAR	/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/dreamplug.h +0 -1
index b1ca859..981233a 100644
@@ -34,7 +34,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_TYPE	MACH_TYPE_DREAMPLUG
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/goflexhome.h +0 -1
index 30a5859..5ed9497 100644
@@ -24,7 +24,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_GOFLEXHOME		/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/guruplug.h +0 -1
index e401e7e..a56a4cb 100644
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_GURUPLUG	/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/ib62x0.h +0 -1
index 186fd35..f4c748a 100644
@@ -18,7 +18,6 @@
  * High level configuration options
  */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SOC Family Name */
 #define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
include/configs/iconnect.h +0 -1
index a58f076..9f4a4b8 100644
@@ -18,7 +18,6 @@
  * High level configuration options
  */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SOC Family Name */
 #define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
include/configs/km/km_arm.h +0 -1
index 6d77680..d31e674 100644
@@ -28,7 +28,6 @@
  */
 #define CONFIG_MARVELL
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SOC Family Name */
 #define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_MACH_KM_KIRKWOOD		/* Machine type */
 
include/configs/lacie_kw.h +0 -1
index 2d2e23a..9ac5d33 100644
@@ -41,7 +41,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SoC Family Name */
 /* SoC name */
 #if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
 #define CONFIG_KW88F6192
include/configs/lsxl.h +0 -1
index f5f4961..bf5c1a1 100644
@@ -29,7 +29,6 @@
  * General configuration options
  */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SOC Family Name */
 #define CONFIG_KW88F6281		/* SOC Name */
 
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/mv88f6281gtw_ge.h +0 -1
index f6c06ee..311fc0c 100644
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_MV88F6281GTW_GE	/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/openrd.h +0 -1
index 8fab6e6..6efc4c3 100644
@@ -35,7 +35,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_SHEEVA_88SV131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_OPENRD_BASE	/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/pogo_e02.h +0 -1
index a81d452..7594bdb 100644
@@ -24,7 +24,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SOC Family Name */
 #define CONFIG_KW88F6281		/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 
include/configs/rd6281a.h +0 -1
index 9856516..e80949e 100644
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_RD6281A		/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/sheevaplug.h +0 -1
index ecc93bc..dd984ee 100644
@@ -18,7 +18,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_SHEEVAPLUG	/* Machine type */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
include/configs/tk71.h +0 -1
index 16e8a7f..a9c6d2e 100644
@@ -17,7 +17,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131	1	/* CPU Core subversion */
-#define CONFIG_KIRKWOOD		1	/* SOC Family Name */
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
 #define CONFIG_NR_DRAM_BANKS	1
include/configs/wireless_space.h +0 -1
index 2070a9b..036c1e4 100644
@@ -21,7 +21,6 @@
  * High Level Configuration Options (easy to change)
  */
 #define CONFIG_FEROCEON_88FR131		/* CPU Core subversion */
-#define CONFIG_KIRKWOOD			/* SoC Family Name */
 /* SoC name */
 #define CONFIG_KW88F6281
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
Signature · 1 line
1.9.1
#10 lore raw

PATCH 6/15 kirkwood: kconfig: refactor Kconfig and defconfig

Hi Masahiro,

Quoted 9 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the KirkWood board select menu to kirkwood/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="kirkwood").

Cc Prafulla Wadaskar <[email protected]>

---

I have just a few minor style comments below...

arch/arm/cpu/arm926ejs/kirkwood/Kconfig line 16

Quoted 2 lines
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +2 -0
+config TARGET_DREAMPLUG
+	bool "Dreamplug Board"

This sould be "DramPlug Board".

arch/arm/cpu/arm926ejs/kirkwood/Kconfig line 19

Quoted 2 lines
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +2 -0
+config TARGET_GURUPLUG
+	bool "Guruplug Board"

This sould be "GuruPlug Board".

arch/arm/cpu/arm926ejs/kirkwood/Kconfig line 22

Quoted 2 lines
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +2 -0
+config TARGET_SHEEVAPLUG
+	bool "Sheevaplug Board"

This sould be "SheevaPlug Board".

arch/arm/cpu/arm926ejs/kirkwood/Kconfig line 52

Quoted 2 lines
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +2 -0
+config TARGET_IB62X0
+	bool "Ib62x0 Board"

This sould be "ib62x0 Board".

arch/arm/cpu/arm926ejs/kirkwood/Kconfig line 58

Quoted 2 lines
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +2 -0
+config TARGET_GOFLEXHOME
+	bool "Goflexhome Board"

This sould be "GoFlex Home Board".

Luka

#11 lore raw

PATCH 6/15 kirkwood: kconfig: refactor Kconfig and defconfig

Hi Luka,

Quoted 13 lines · On Tue, 5 Aug 2014 10:54:56 +0200 Luka Perkov <[email protected]> wrote:

Hi Masahiro,

Quoted 9 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the KirkWood board select menu to kirkwood/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="kirkwood").

Cc Prafulla Wadaskar <[email protected]>

---

Quoted 6 lines

I have just a few minor style comments below...

arch/arm/cpu/arm926ejs/kirkwood/Kconfig line 16

Quoted 2 lines
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +2 -0
+config TARGET_DREAMPLUG
+	bool "Dreamplug Board"

This sould be "DramPlug Board".

I assume this is a typo.

"DreamPlug Board" ?

I will fix in v2.

Thanks for pointing out it.

Best Regards
Masahiro Yamada

#12 lore raw

PATCH 6/15 kirkwood: kconfig: refactor Kconfig and defconfig

Hi Masahiro,

Quoted 9 lines · Masahiro Yamada

On Tue, 5 Aug 2014 10:54:56 +0200

Quoted 4 lines

arch/arm/cpu/arm926ejs/kirkwood/Kconfig line 16

Quoted 2 lines
arch/arm/cpu/arm926ejs/kirkwood/Kconfig new file +2 -0
+config TARGET_DREAMPLUG
+	bool "Dreamplug Board"

This sould be "DramPlug Board".

I assume this is a typo.

"DreamPlug Board" ?

Yes, sorry.

Quoted 1 line

I will fix in v2.

Great, thanks.

Luka

#13 lore raw

PATCH 7/15 exynos: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Exynos board select menu to exynos/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="exynos").

---

 arch/arm/Kconfig                     | 41 +++------------------------
 arch/arm/cpu/armv7/exynos/Kconfig    | 55 ++++++++++++++++++++++++++++++++++++
 board/samsung/arndale/Kconfig        |  8 ------
 board/samsung/origen/Kconfig         |  8 ------
 board/samsung/smdk5250/Kconfig       | 16 -----------
 board/samsung/smdk5420/Kconfig       | 16 -----------
 board/samsung/smdkv310/Kconfig       |  8 ------
 board/samsung/trats/Kconfig          |  8 ------
 board/samsung/trats2/Kconfig         |  8 ------
 board/samsung/universal_c210/Kconfig |  8 ------
 configs/arndale_defconfig            |  1 +
 configs/origen_defconfig             |  1 +
 configs/peach-pit_defconfig          |  1 +
 configs/s5pc210_universal_defconfig  |  1 +
 configs/smdk5250_defconfig           |  1 +
 configs/smdk5420_defconfig           |  1 +
 configs/smdkv310_defconfig           |  1 +
 configs/snow_defconfig               |  1 +
 configs/trats2_defconfig             |  1 +
 configs/trats_defconfig              |  1 +
 20 files changed, 69 insertions(+), 117 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/exynos/Kconfig
arch/arm/Kconfig +4 -37
index 43d0ce5..e3b49bb 100644
@@ -368,35 +368,8 @@ config TARGET_SAMA5D3XEK
 config TARGET_BCM28155_AP
 	bool "Support bcm28155_ap"
 
-config TARGET_ARNDALE
-	bool "Support arndale"
-
-config TARGET_ORIGEN
-	bool "Support origen"
-
-config TARGET_SMDK5250
-	bool "Support smdk5250"
-
-config TARGET_SNOW
-	bool "Support snow"
-
-config TARGET_PEACH_PIT
-	bool "Support peach-pit"
-
-config TARGET_SMDK5420
-	bool "Support smdk5420"
-
-config TARGET_SMDKV310
-	bool "Support smdkv310"
-
-config TARGET_TRATS
-	bool "Support trats"
-
-config TARGET_TRATS2
-	bool "Support trats2"
-
-config TARGET_S5PC210_UNIVERSAL
-	bool "Support s5pc210_universal"
+config ARCH_EXYNOS
+	bool "Samsung EXYNOS"
 
 config TARGET_HIGHBANK
 	bool "Support highbank"
@@ -647,6 +620,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/armv7/exynos/Kconfig"
+
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
 
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
@@ -780,17 +755,9 @@ source "board/raspberrypi/rpi_b/Kconfig"
 source "board/ronetix/pm9261/Kconfig"
 source "board/ronetix/pm9263/Kconfig"
 source "board/ronetix/pm9g45/Kconfig"
-source "board/samsung/arndale/Kconfig"
 source "board/samsung/goni/Kconfig"
-source "board/samsung/origen/Kconfig"
 source "board/samsung/smdk2410/Kconfig"
-source "board/samsung/smdk5250/Kconfig"
-source "board/samsung/smdk5420/Kconfig"
 source "board/samsung/smdkc100/Kconfig"
-source "board/samsung/smdkv310/Kconfig"
-source "board/samsung/trats/Kconfig"
-source "board/samsung/trats2/Kconfig"
-source "board/samsung/universal_c210/Kconfig"
 source "board/sandisk/sansa_fuze_plus/Kconfig"
 source "board/scb9328/Kconfig"
 source "board/schulercontrol/sc_sps_1/Kconfig"
arch/arm/cpu/armv7/exynos/Kconfig new file +55 -0

55 lines not on this page · raw message

board/samsung/arndale/Kconfig +0 -8
index c3af0ec..5fdbacb 100644
@@ -1,9 +1,5 @@
 if TARGET_ARNDALE
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "arndale"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "arndale"
board/samsung/origen/Kconfig +0 -8
index f52de83..3eda350 100644
@@ -1,9 +1,5 @@
 if TARGET_ORIGEN
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "origen"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "origen"
board/samsung/smdk5250/Kconfig +0 -16
index edebbde..e7036f5 100644
@@ -1,9 +1,5 @@
 if TARGET_SMDK5250
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "smdk5250"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "smdk5250"
@@ -24,10 +16,6 @@ endif
 
 if TARGET_SNOW
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "smdk5250"
@@ -36,10 +24,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "snow"
board/samsung/smdk5420/Kconfig +0 -16
index 052c275..fb9bedd 100644
@@ -1,9 +1,5 @@
 if TARGET_PEACH_PIT
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "smdk5420"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "peach-pit"
@@ -24,10 +16,6 @@ endif
 
 if TARGET_SMDK5420
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "smdk5420"
@@ -36,10 +24,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "smdk5420"
board/samsung/smdkv310/Kconfig +0 -8
index e467092..785fae2 100644
@@ -1,9 +1,5 @@
 if TARGET_SMDKV310
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "smdkv310"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "smdkv310"
board/samsung/trats/Kconfig +0 -8
index 040413e..8bfb12d 100644
@@ -1,9 +1,5 @@
 if TARGET_TRATS
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "trats"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "trats"
board/samsung/trats2/Kconfig +0 -8
index a82fdfb..f359c03 100644
@@ -1,9 +1,5 @@
 if TARGET_TRATS2
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "trats2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "trats2"
board/samsung/universal_c210/Kconfig +0 -8
index 082168f..72b879a 100644
@@ -1,9 +1,5 @@
 if TARGET_S5PC210_UNIVERSAL
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "universal_c210"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "samsung"
 
-config SYS_SOC
-	string
-	default "exynos"
-
 config SYS_CONFIG_NAME
 	string
 	default "s5pc210_universal"
configs/arndale_defconfig +1 -0
index 7cc4307..7ea5c0d 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_ARNDALE=y
configs/origen_defconfig +1 -0
index e0d10d3..aa92381 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_ORIGEN=y
configs/peach-pit_defconfig +1 -0
index 68ba794..797d5e0 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_PEACH_PIT=y
configs/s5pc210_universal_defconfig +1 -0
index 572df1d..a9a3446 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_S5PC210_UNIVERSAL=y
configs/smdk5250_defconfig +1 -0
index a35e4fc..465a75a 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDK5250=y
configs/smdk5420_defconfig +1 -0
index 12933f0..9dc43f2 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDK5420=y
configs/smdkv310_defconfig +1 -0
index d87986a..44da273 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDKV310=y
configs/snow_defconfig +1 -0
index 44c4701..2d59046 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SNOW=y
configs/trats2_defconfig +1 -0
index 0a53f09..fa82724 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS2=y
configs/trats_defconfig +1 -0
index 93b94c0..f888a51 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_TRATS=y
Signature · 1 line
1.9.1
#14 lore raw

PATCH 8/15 davinci: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Davinci board select menu to davinci/Kconfig.

Move also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="davinci").

Cc Heiko Schocher <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rini <[email protected]>

---

 arch/arm/Kconfig                       | 67 +++-------------------------
 arch/arm/cpu/arm926ejs/davinci/Kconfig | 79 ++++++++++++++++++++++++++++++++++
 board/Barix/ipam390/Kconfig            |  8 ----
 board/ait/cam_enc_4xx/Kconfig          |  8 ----
 board/davinci/da8xxevm/Kconfig         | 24 -----------
 board/davinci/dm355evm/Kconfig         |  8 ----
 board/davinci/dm355leopard/Kconfig     |  8 ----
 board/davinci/dm365evm/Kconfig         |  8 ----
 board/davinci/dm6467evm/Kconfig        |  8 ----
 board/davinci/dvevm/Kconfig            |  8 ----
 board/davinci/ea20/Kconfig             |  8 ----
 board/davinci/schmoogie/Kconfig        |  8 ----
 board/davinci/sffsdr/Kconfig           |  8 ----
 board/davinci/sonata/Kconfig           |  8 ----
 board/enbw/enbw_cmc/Kconfig            |  8 ----
 board/omicron/calimain/Kconfig         |  8 ----
 configs/calimain_defconfig             |  1 +
 configs/cam_enc_4xx_defconfig          |  1 +
 configs/da830evm_defconfig             |  1 +
 configs/da850_am18xxevm_defconfig      |  1 +
 configs/da850evm_defconfig             |  1 +
 configs/da850evm_direct_nor_defconfig  |  1 +
 configs/davinci_dm355evm_defconfig     |  1 +
 configs/davinci_dm355leopard_defconfig |  1 +
 configs/davinci_dm365evm_defconfig     |  1 +
 configs/davinci_dm6467Tevm_defconfig   |  1 +
 configs/davinci_dm6467evm_defconfig    |  1 +
 configs/davinci_dvevm_defconfig        |  1 +
 configs/davinci_schmoogie_defconfig    |  1 +
 configs/davinci_sffsdr_defconfig       |  1 +
 configs/davinci_sonata_defconfig       |  1 +
 configs/ea20_defconfig                 |  1 +
 configs/enbw_cmc_defconfig             |  1 +
 configs/hawkboard_defconfig            |  1 +
 configs/hawkboard_uart_defconfig       |  1 +
 configs/ipam390_defconfig              |  1 +
 36 files changed, 105 insertions(+), 189 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/davinci/Kconfig
arch/arm/Kconfig +6 -61
index e3b49bb..8b3b7f7 100644
@@ -131,53 +131,10 @@ config TARGET_TAURUS
 config TARGET_STAMP9G20
 	bool "Support stamp9g20"
 
-config TARGET_CAM_ENC_4XX
-	bool "Support cam_enc_4xx"
-
-config TARGET_IPAM390
-	bool "Support ipam390"
-
-config TARGET_DA830EVM
-	bool "Support da830evm"
-
-config TARGET_DA850EVM
-	bool "Support da850evm"
-
-config TARGET_HAWKBOARD
-	bool "Support hawkboard"
-
-config TARGET_DAVINCI_DM355EVM
-	bool "Support davinci_dm355evm"
-
-config TARGET_DAVINCI_DM355LEOPARD
-	bool "Support davinci_dm355leopard"
-
-config TARGET_DAVINCI_DM365EVM
-	bool "Support davinci_dm365evm"
-
-config TARGET_DAVINCI_DM6467EVM
-	bool "Support davinci_dm6467evm"
-
-config TARGET_DAVINCI_DVEVM
-	bool "Support davinci_dvevm"
-
-config TARGET_EA20
-	bool "Support ea20"
-
-config TARGET_DAVINCI_SCHMOOGIE
-	bool "Support davinci_schmoogie"
-
-config TARGET_DAVINCI_SFFSDR
-	bool "Support davinci_sffsdr"
-
-config TARGET_DAVINCI_SONATA
-	bool "Support davinci_sonata"
-
-config TARGET_ENBW_CMC
-	bool "Support enbw_cmc"
-
-config TARGET_CALIMAIN
-	bool "Support calimain"
+config ARCH_DAVINCI
+	bool "TI DaVinci"
+	help
+	  Support for TI's DaVinci platform.
 
 config KIRKWOOD
 	bool "Marvell Kirkwood"
@@ -620,6 +577,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
+
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
@@ -633,7 +592,6 @@ source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
 source "arch/arm/cpu/armv7/zynq/Kconfig"
 
 source "board/8dtech/eco5pk/Kconfig"
-source "board/Barix/ipam390/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/BuS/eb_cpux9k2/Kconfig"
@@ -644,7 +602,6 @@ source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/dkb/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
 source "board/afeb9260/Kconfig"
-source "board/ait/cam_enc_4xx/Kconfig"
 source "board/altera/socfpga/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/integrator/Kconfig"
@@ -680,22 +637,11 @@ source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/corscience/tricorder/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/davedenx/qong/Kconfig"
-source "board/davinci/da8xxevm/Kconfig"
-source "board/davinci/dm355evm/Kconfig"
-source "board/davinci/dm355leopard/Kconfig"
-source "board/davinci/dm365evm/Kconfig"
-source "board/davinci/dm6467evm/Kconfig"
-source "board/davinci/dvevm/Kconfig"
-source "board/davinci/ea20/Kconfig"
-source "board/davinci/schmoogie/Kconfig"
-source "board/davinci/sffsdr/Kconfig"
-source "board/davinci/sonata/Kconfig"
 source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
 source "board/egnite/ethernut5/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/emk/top9000/Kconfig"
-source "board/enbw/enbw_cmc/Kconfig"
 source "board/esd/meesc/Kconfig"
 source "board/esd/otc570/Kconfig"
 source "board/esg/ima3-mx53/Kconfig"
@@ -742,7 +688,6 @@ source "board/matrix_vision/mvblx/Kconfig"
 source "board/mpl/vcma9/Kconfig"
 source "board/nokia/rx51/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
-source "board/omicron/calimain/Kconfig"
 source "board/overo/Kconfig"
 source "board/palmld/Kconfig"
 source "board/palmtc/Kconfig"
arch/arm/cpu/arm926ejs/davinci/Kconfig new file +79 -0

79 lines not on this page · raw message

board/Barix/ipam390/Kconfig +0 -8
index a8134479..588ee73 100644
@@ -1,9 +1,5 @@
 if TARGET_IPAM390
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "ipam390"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Barix"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "ipam390"
board/ait/cam_enc_4xx/Kconfig +0 -8
index d1f89df..2b88692 100644
@@ -1,9 +1,5 @@
 if TARGET_CAM_ENC_4XX
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "cam_enc_4xx"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ait"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "cam_enc_4xx"
board/davinci/da8xxevm/Kconfig +0 -24
index 89f78d7..b123703 100644
@@ -1,9 +1,5 @@
 if TARGET_DA830EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "da8xxevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "da830evm"
@@ -24,10 +16,6 @@ endif
 
 if TARGET_DA850EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "da8xxevm"
@@ -36,10 +24,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "da850evm"
@@ -48,10 +32,6 @@ endif
 
 if TARGET_HAWKBOARD
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "da8xxevm"
@@ -60,10 +40,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "hawkboard"
board/davinci/dm355evm/Kconfig +0 -8
index 2dbb509..7490bc0 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM355EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm355evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm355evm"
board/davinci/dm355leopard/Kconfig +0 -8
index 345704f..73a53ff 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM355LEOPARD
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm355leopard"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm355leopard"
board/davinci/dm365evm/Kconfig +0 -8
index d5f7ea2..266c6ee 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM365EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm365evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm365evm"
board/davinci/dm6467evm/Kconfig +0 -8
index f7b225d..1c4d0f0 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM6467EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm6467evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm6467evm"
board/davinci/dvevm/Kconfig +0 -8
index 7a2d86b..e020f8d 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DVEVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dvevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dvevm"
board/davinci/ea20/Kconfig +0 -8
index afab821..93950fd 100644
@@ -1,9 +1,5 @@
 if TARGET_EA20
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "ea20"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "ea20"
board/davinci/schmoogie/Kconfig +0 -8
index 45401e4..7aa459d 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_SCHMOOGIE
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "schmoogie"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_schmoogie"
board/davinci/sffsdr/Kconfig +0 -8
index aeb7ef2..95461fc 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_SFFSDR
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "sffsdr"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_sffsdr"
board/davinci/sonata/Kconfig +0 -8
index 2cf5035..a21fb8e 100644
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_SONATA
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "sonata"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_sonata"
board/enbw/enbw_cmc/Kconfig +0 -8
index e061e7e..183334b 100644
@@ -1,9 +1,5 @@
 if TARGET_ENBW_CMC
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "enbw_cmc"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "enbw"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "enbw_cmc"
board/omicron/calimain/Kconfig +0 -8
index 923af8a..46e95d8 100644
@@ -1,9 +1,5 @@
 if TARGET_CALIMAIN
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "calimain"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "omicron"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "calimain"
configs/calimain_defconfig +1 -0
index a808ddf..02d3912 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CALIMAIN=y
configs/cam_enc_4xx_defconfig +1 -0
index 1417d83..dfdda82 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_CAM_ENC_4XX=y
configs/da830evm_defconfig +1 -0
index 49e74c3..d27cdb0 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA830EVM=y
configs/da850_am18xxevm_defconfig +1 -0
index af419ce..a79a0a8 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_DA850EVM=y
configs/da850evm_defconfig +1 -0
index 7517e92..afdce5e 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_DA850EVM=y
configs/da850evm_direct_nor_defconfig +1 -0
index edc604a..25c303c 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
configs/davinci_dm355evm_defconfig +1 -0
index ef0b854..d3a03b2 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355EVM=y
configs/davinci_dm355leopard_defconfig +1 -0
index 22da9f3..875c0b5 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
configs/davinci_dm365evm_defconfig +1 -0
index dfae0b2..f841fd9 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM365EVM=y
configs/davinci_dm6467Tevm_defconfig +1 -0
index e2c2de4..4523d4a 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="DAVINCI_DM6467TEVM,REFCLK_FREQ=33000000"
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM6467EVM=y
configs/davinci_dm6467evm_defconfig +1 -0
index abd3491..5208257 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM6467EVM=y
configs/davinci_dvevm_defconfig +1 -0
index eb53692..74e55b9 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DVEVM=y
configs/davinci_schmoogie_defconfig +1 -0
index bc166ab..64ed2c1 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
configs/davinci_sffsdr_defconfig +1 -0
index ea9cf88..9eb0f07 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SFFSDR=y
configs/davinci_sonata_defconfig +1 -0
index 2c9cd4f..d8f0f77 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SONATA=y
configs/ea20_defconfig +1 -0
index 562849d..93676cd 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
configs/enbw_cmc_defconfig +1 -0
index 7fe405a..92c4926 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_ENBW_CMC=y
configs/hawkboard_defconfig +1 -0
index 9945fe5..4084f9c 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_HAWKBOARD=y
configs/hawkboard_uart_defconfig +1 -0
index b4db291..d7eeae7 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="UART_U_BOOT"
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_HAWKBOARD=y
configs/ipam390_defconfig +1 -0
index 6e95951..4fefcbe 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_IPAM390=y
Signature · 1 line
1.9.1
#15 lore raw

PATCH 8/15 davinci: kconfig: move board select menu and common settings

Quoted 10 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Davinci board select menu to davinci/Kconfig.

Move also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="davinci").

Cc Heiko Schocher <[email protected]>
Cc Sandeep Paulraj <[email protected]>
Cc Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140804/00e1549c/attachment.pgp>
#16 lore raw

PATCH 9/15 omap3: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the OMAP3 board select menu to omap3/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="omap3

---

 arch/arm/Kconfig                       |  93 ++--------------------------
 arch/arm/cpu/armv7/omap3/Kconfig       | 107 +++++++++++++++++++++++++++++++++
 board/8dtech/eco5pk/Kconfig            |   8 ---
 board/comelit/dig297/Kconfig           |   8 ---
 board/compulab/cm_t35/Kconfig          |   8 ---
 board/corscience/tricorder/Kconfig     |   8 ---
 board/htkw/mcx/Kconfig                 |   8 ---
 board/isee/igep00x0/Kconfig            |   8 ---
 board/logicpd/am3517evm/Kconfig        |   8 ---
 board/logicpd/omap3som/Kconfig         |   8 ---
 board/logicpd/zoom1/Kconfig            |   8 ---
 board/matrix_vision/mvblx/Kconfig      |   8 ---
 board/nokia/rx51/Kconfig               |   8 ---
 board/overo/Kconfig                    |   8 ---
 board/pandora/Kconfig                  |   8 ---
 board/technexion/tao3530/Kconfig       |   8 ---
 board/technexion/twister/Kconfig       |   8 ---
 board/teejet/mt_ventoux/Kconfig        |   8 ---
 board/ti/am3517crane/Kconfig           |   8 ---
 board/ti/beagle/Kconfig                |   8 ---
 board/ti/evm/Kconfig                   |  24 --------
 board/ti/sdp3430/Kconfig               |   8 ---
 board/timll/devkit8000/Kconfig         |   8 ---
 configs/am3517_crane_defconfig         |   1 +
 configs/am3517_evm_defconfig           |   1 +
 configs/cm_t35_defconfig               |   1 +
 configs/devkit8000_defconfig           |   1 +
 configs/dig297_defconfig               |   1 +
 configs/eco5pk_defconfig               |   1 +
 configs/igep0020_defconfig             |   1 +
 configs/igep0020_nand_defconfig        |   1 +
 configs/igep0030_defconfig             |   1 +
 configs/igep0030_nand_defconfig        |   1 +
 configs/igep0032_defconfig             |   1 +
 configs/mcx_defconfig                  |   1 +
 configs/mt_ventoux_defconfig           |   1 +
 configs/nokia_rx51_defconfig           |   1 +
 configs/omap3_beagle_defconfig         |   1 +
 configs/omap3_evm_defconfig            |   1 +
 configs/omap3_evm_quick_mmc_defconfig  |   1 +
 configs/omap3_evm_quick_nand_defconfig |   1 +
 configs/omap3_ha_defconfig             |   1 +
 configs/omap3_logic_defconfig          |   1 +
 configs/omap3_mvblx_defconfig          |   1 +
 configs/omap3_overo_defconfig          |   1 +
 configs/omap3_pandora_defconfig        |   1 +
 configs/omap3_sdp3430_defconfig        |   1 +
 configs/omap3_zoom1_defconfig          |   1 +
 configs/tao3530_defconfig              |   1 +
 configs/tricorder_defconfig            |   1 +
 configs/tricorder_flash_defconfig      |   1 +
 configs/twister_defconfig              |   1 +
 include/configs/am3517_crane.h         |   1 -
 include/configs/am3517_evm.h           |   1 -
 include/configs/cm_t35.h               |   1 -
 include/configs/devkit8000.h           |   1 -
 include/configs/dig297.h               |   1 -
 include/configs/mcx.h                  |   1 -
 include/configs/nokia_rx51.h           |   1 -
 include/configs/omap3_evm_common.h     |   1 -
 include/configs/omap3_logic.h          |   1 -
 include/configs/omap3_mvblx.h          |   1 -
 include/configs/omap3_pandora.h        |   1 -
 include/configs/omap3_sdp3430.h        |   1 -
 include/configs/tam3517-common.h       |   1 -
 include/configs/tao3530.h              |   1 -
 include/configs/ti_omap3_common.h      |   1 -
 include/configs/tricorder.h            |   1 -
 68 files changed, 140 insertions(+), 289 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/omap3/Kconfig
arch/arm/Kconfig +4 -89
index 8b3b7f7..ee29e30 100644
@@ -400,74 +400,8 @@ config TARGET_GW_VENTANA
 config TARGET_HUMMINGBOARD
 	bool "Support hummingboard"
 
-config TARGET_OMAP3_OVERO
-	bool "Support omap3_overo"
-
-config TARGET_OMAP3_PANDORA
-	bool "Support omap3_pandora"
-
-config TARGET_ECO5PK
-	bool "Support eco5pk"
-
-config TARGET_DIG297
-	bool "Support dig297"
-
-config TARGET_CM_T35
-	bool "Support cm_t35"
-
-config TARGET_TRICORDER
-	bool "Support tricorder"
-
-config TARGET_MCX
-	bool "Support mcx"
-
-config TARGET_OMAP3_IGEP00X0
-	bool "Support omap3_igep00x0"
-
-config TARGET_AM3517_EVM
-	bool "Support am3517_evm"
-
-config TARGET_OMAP3_LOGIC
-	bool "Support omap3_logic"
-
-config TARGET_OMAP3_ZOOM1
-	bool "Support omap3_zoom1"
-
-config TARGET_OMAP3_MVBLX
-	bool "Support omap3_mvblx"
-
-config TARGET_NOKIA_RX51
-	bool "Support nokia_rx51"
-
-config TARGET_TAO3530
-	bool "Support tao3530"
-
-config TARGET_TWISTER
-	bool "Support twister"
-
-config TARGET_MT_VENTOUX
-	bool "Support mt_ventoux"
-
-config TARGET_AM3517_CRANE
-	bool "Support am3517_crane"
-
-config TARGET_OMAP3_BEAGLE
-	bool "Support omap3_beagle"
-
-config TARGET_OMAP3_EVM
-	bool "Support omap3_evm"
-
-config TARGET_OMAP3_EVM_QUICK_MMC
-	bool "Support omap3_evm_quick_mmc"
-
-config TARGET_OMAP3_EVM_QUICK_NAND
-	bool "Support omap3_evm_quick_nand"
-
-config TARGET_OMAP3_SDP3430
-	bool "Support omap3_sdp3430"
-
-config TARGET_DEVKIT8000
-	bool "Support devkit8000"
+config OMAP34XX
+	bool "OMAP34XX SoC"
 
 config TARGET_DUOVERO
 	bool "Support duovero"
@@ -583,6 +517,8 @@ source "arch/arm/cpu/armv7/exynos/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
 
+source "arch/arm/cpu/armv7/omap3/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -591,7 +527,6 @@ source "arch/arm/cpu/arm926ejs/versatile/Kconfig"
 
 source "arch/arm/cpu/armv7/zynq/Kconfig"
 
-source "board/8dtech/eco5pk/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/BuS/eb_cpux9k2/Kconfig"
@@ -629,12 +564,9 @@ source "board/calao/usb_a9263/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
 source "board/cm4008/Kconfig"
 source "board/cm41xx/Kconfig"
-source "board/comelit/dig297/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
-source "board/compulab/cm_t35/Kconfig"
 source "board/compulab/cm_t54/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
-source "board/corscience/tricorder/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/davedenx/qong/Kconfig"
 source "board/denx/m28evk/Kconfig"
@@ -672,27 +604,18 @@ source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hale/tt01/Kconfig"
 source "board/highbank/Kconfig"
-source "board/htkw/mcx/Kconfig"
 source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
-source "board/isee/igep00x0/Kconfig"
 source "board/jornada/Kconfig"
 source "board/karo/tx25/Kconfig"
-source "board/logicpd/am3517evm/Kconfig"
 source "board/logicpd/imx27lite/Kconfig"
 source "board/logicpd/imx31_litekit/Kconfig"
-source "board/logicpd/omap3som/Kconfig"
-source "board/logicpd/zoom1/Kconfig"
-source "board/matrix_vision/mvblx/Kconfig"
 source "board/mpl/vcma9/Kconfig"
-source "board/nokia/rx51/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
-source "board/overo/Kconfig"
 source "board/palmld/Kconfig"
 source "board/palmtc/Kconfig"
 source "board/palmtreo680/Kconfig"
-source "board/pandora/Kconfig"
 source "board/phytec/pcm051/Kconfig"
 source "board/ppcag/bg0900/Kconfig"
 source "board/pxa255_idp/Kconfig"
@@ -725,25 +648,17 @@ source "board/sunxi/Kconfig"
 source "board/syteco/jadecpu/Kconfig"
 source "board/syteco/zmx25/Kconfig"
 source "board/taskit/stamp9g20/Kconfig"
-source "board/technexion/tao3530/Kconfig"
-source "board/technexion/twister/Kconfig"
-source "board/teejet/mt_ventoux/Kconfig"
 source "board/ti/am335x/Kconfig"
-source "board/ti/am3517crane/Kconfig"
 source "board/ti/am43xx/Kconfig"
-source "board/ti/beagle/Kconfig"
 source "board/ti/dra7xx/Kconfig"
-source "board/ti/evm/Kconfig"
 source "board/ti/ks2_evm/Kconfig"
 source "board/ti/omap5_uevm/Kconfig"
 source "board/ti/panda/Kconfig"
-source "board/ti/sdp3430/Kconfig"
 source "board/ti/sdp4430/Kconfig"
 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/tnetv107xevm/Kconfig"
 source "board/timll/devkit3250/Kconfig"
-source "board/timll/devkit8000/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
arch/arm/cpu/armv7/omap3/Kconfig new file +107 -0

107 lines not on this page · raw message

board/8dtech/eco5pk/Kconfig +0 -8
index fb1b308..0af1b30 100644
@@ -1,9 +1,5 @@
 if TARGET_ECO5PK
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "eco5pk"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "8dtech"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "eco5pk"
board/comelit/dig297/Kconfig +0 -8
index d7a2bf2..4c5ea09 100644
@@ -1,9 +1,5 @@
 if TARGET_DIG297
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "dig297"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "comelit"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "dig297"
board/compulab/cm_t35/Kconfig +0 -8
index fd960bc..06de692 100644
@@ -1,9 +1,5 @@
 if TARGET_CM_T35
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "cm_t35"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "compulab"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "cm_t35"
board/corscience/tricorder/Kconfig +0 -8
index a1e06e7..5147fd7 100644
@@ -1,9 +1,5 @@
 if TARGET_TRICORDER
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "tricorder"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "corscience"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "tricorder"
board/htkw/mcx/Kconfig +0 -8
index 1e2c679..343ff4d 100644
@@ -1,9 +1,5 @@
 if TARGET_MCX
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "mcx"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "htkw"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "mcx"
board/isee/igep00x0/Kconfig +0 -8
index c9f2969..c9352fd 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP3_IGEP00X0
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "igep00x0"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "isee"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_igep00x0"
board/logicpd/am3517evm/Kconfig +0 -8
index 9bc5ae5..1012d3d 100644
@@ -1,9 +1,5 @@
 if TARGET_AM3517_EVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "am3517evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "logicpd"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "am3517_evm"
board/logicpd/omap3som/Kconfig +0 -8
index daaefa6..adeaf4d 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP3_LOGIC
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "omap3som"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "logicpd"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_logic"
board/logicpd/zoom1/Kconfig +0 -8
index 3199130..e9a5623 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP3_ZOOM1
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "zoom1"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "logicpd"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_zoom1"
board/matrix_vision/mvblx/Kconfig +0 -8
index d89c1e3..69f0566 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP3_MVBLX
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "mvblx"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "matrix_vision"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_mvblx"
board/nokia/rx51/Kconfig +0 -8
index 41d0daa..faa90d2 100644
@@ -1,9 +1,5 @@
 if TARGET_NOKIA_RX51
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "rx51"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "nokia"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "nokia_rx51"
board/overo/Kconfig +0 -8
index 1d4a261..d1ea236 100644
@@ -1,17 +1,9 @@
 if TARGET_OMAP3_OVERO
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "overo"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_overo"
board/pandora/Kconfig +0 -8
index a36c0c8..6f41005 100644
@@ -1,17 +1,9 @@
 if TARGET_OMAP3_PANDORA
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "pandora"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_pandora"
board/technexion/tao3530/Kconfig +0 -8
index 06e56a4..910a9cd 100644
@@ -1,9 +1,5 @@
 if TARGET_TAO3530
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "tao3530"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "technexion"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "tao3530"
board/technexion/twister/Kconfig +0 -8
index 1790f6d..e6f811a 100644
@@ -1,9 +1,5 @@
 if TARGET_TWISTER
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "twister"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "technexion"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "twister"
board/teejet/mt_ventoux/Kconfig +0 -8
index 96cf7c0..a567204 100644
@@ -1,9 +1,5 @@
 if TARGET_MT_VENTOUX
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "mt_ventoux"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "teejet"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "mt_ventoux"
board/ti/am3517crane/Kconfig +0 -8
index fdb20ab..c44dab5 100644
@@ -1,9 +1,5 @@
 if TARGET_AM3517_CRANE
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "am3517crane"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "am3517_crane"
board/ti/beagle/Kconfig +0 -8
index 15dccdf..10c81c2 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP3_BEAGLE
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "beagle"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_beagle"
board/ti/evm/Kconfig +0 -24
index e342942..c54ce33 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP3_EVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_evm"
@@ -24,10 +16,6 @@ endif
 
 if TARGET_OMAP3_EVM_QUICK_MMC
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "evm"
@@ -36,10 +24,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_evm_quick_mmc"
@@ -48,10 +32,6 @@ endif
 
 if TARGET_OMAP3_EVM_QUICK_NAND
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "evm"
@@ -60,10 +40,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_evm_quick_nand"
board/ti/sdp3430/Kconfig +0 -8
index 81989b7..fcf7329 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP3_SDP3430
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "sdp3430"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap3_sdp3430"
board/timll/devkit8000/Kconfig +0 -8
index d9c920c..d1603f4 100644
@@ -1,9 +1,5 @@
 if TARGET_DEVKIT8000
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "devkit8000"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "timll"
 
-config SYS_SOC
-	string
-	default "omap3"
-
 config SYS_CONFIG_NAME
 	string
 	default "devkit8000"
configs/am3517_crane_defconfig +1 -0
index ec93224..cf9d8c7 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_AM3517_CRANE=y
configs/am3517_evm_defconfig +1 -0
index 1fab6c1..2336f1e 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_AM3517_EVM=y
configs/cm_t35_defconfig +1 -0
index 00b0590..2bb616f 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_CM_T35=y
configs/devkit8000_defconfig +1 -0
index 7c5d222..578ae74 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_DEVKIT8000=y
configs/dig297_defconfig +1 -0
index 9309ac2..95bc353 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_DIG297=y
configs/eco5pk_defconfig +1 -0
index 79f3d5a..e45bdad 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_ECO5PK=y
configs/igep0020_defconfig +1 -0
index e99f773..dd56ea1 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_ONENAND"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_IGEP00X0=y
configs/igep0020_nand_defconfig +1 -0
index baa4a0a..da54da0 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0020,BOOT_NAND"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_IGEP00X0=y
configs/igep0030_defconfig +1 -0
index 5f404eb..1025fed 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_ONENAND"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_IGEP00X0=y
configs/igep0030_nand_defconfig +1 -0
index a43dfec..b3b3366 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0030,BOOT_NAND"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_IGEP00X0=y
configs/igep0032_defconfig +1 -0
index c0d019c..faa04f7 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0032,BOOT_ONENAND"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_IGEP00X0=y
configs/mcx_defconfig +1 -0
index a700c88..c2031f8 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_MCX=y
configs/mt_ventoux_defconfig +1 -0
index 0fcad87..a0678bb 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_MT_VENTOUX=y
configs/nokia_rx51_defconfig +1 -0
index 055a602..e03f586 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_NOKIA_RX51=y
configs/omap3_beagle_defconfig +1 -0
index a37ca60..a3e4c2c 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="NAND"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_BEAGLE=y
configs/omap3_evm_defconfig +1 -0
index 284abe1..c749aa7 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_EVM=y
configs/omap3_evm_quick_mmc_defconfig +1 -0
index 5bafeac..e89bb82 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y
configs/omap3_evm_quick_nand_defconfig +1 -0
index 501e46f..e70fddd 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y
configs/omap3_ha_defconfig +1 -0
index a183fe7..50bffa9 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BOARD_OMAP3_HA"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TAO3530=y
configs/omap3_logic_defconfig +1 -0
index 6278554..5f2c063 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_LOGIC=y
configs/omap3_mvblx_defconfig +1 -0
index b7ddcc8..fb6edc2 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_MVBLX=y
configs/omap3_overo_defconfig +1 -0
index dca3237..7e0d334 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_OMAP3_OVERO=y
configs/omap3_pandora_defconfig +1 -0
index 54dab48..bf28537 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_PANDORA=y
configs/omap3_sdp3430_defconfig +1 -0
index 9672956..1172c2a 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_SDP3430=y
configs/omap3_zoom1_defconfig +1 -0
index f4c8ed9..e2d0a8c 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_ZOOM1=y
configs/tao3530_defconfig +1 -0
index d8b57b1..a511389 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TAO3530=y
configs/tricorder_defconfig +1 -0
index 80c2df4..7ea5e02 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TRICORDER=y
configs/tricorder_flash_defconfig +1 -0
index 6715e71..f6e1c46 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="FLASHCARD"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TRICORDER=y
configs/twister_defconfig +1 -0
index 27e8364..9023736 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
 +S:CONFIG_TARGET_TWISTER=y
include/configs/am3517_crane.h +0 -1
index 898ed2e..fcb4033 100644
@@ -17,7 +17,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		1	/* which is a 34XX */
 #define CONFIG_OMAP3_AM3517CRANE	1	/* working with CRANEBOARD */
 #define CONFIG_OMAP_COMMON
 
include/configs/am3517_evm.h +0 -1
index 1e2d55b..c5d64ca 100644
@@ -17,7 +17,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		1	/* which is a 34XX */
 #define CONFIG_OMAP3_AM3517EVM	1	/* working with AM3517EVM */
 #define CONFIG_OMAP_COMMON
 
include/configs/cm_t35.h +0 -1
index c63608c..70df1eb 100644
@@ -21,7 +21,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX	/* which is a 34XX */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_CMD_GPIO
 #define CONFIG_CM_T3X	/* working with CM-T35 and CM-T3730 */
include/configs/devkit8000.h +0 -1
index 69c51bc..7ab6d51 100644
@@ -17,7 +17,6 @@
 
 /* High Level Configuration Options */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		1	/* which is a 34XX */
 #define CONFIG_OMAP3_DEVKIT8000	1	/* working with DevKit8000 */
 #define CONFIG_MACH_TYPE	MACH_TYPE_DEVKIT8000
 #define CONFIG_OMAP_GPIO
include/configs/dig297.h +0 -1
index 7e47c56..c8739ed 100644
@@ -28,7 +28,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP		/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		/* which is a 34XX */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
 
include/configs/mcx.h +0 -1
index dff895a..cd85a6c 100644
@@ -13,7 +13,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP			/* in a TI OMAP core */
-#define CONFIG_OMAP34XX			/* which is a 34XX */
 #define CONFIG_OMAP3_MCX		/* working with mcx */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
include/configs/nokia_rx51.h +0 -1
index 43c1617..982b689 100644
@@ -24,7 +24,6 @@
  */
 
 #define CONFIG_OMAP			/* in a TI OMAP core */
-#define CONFIG_OMAP34XX			/* which is a 34XX */
 #define CONFIG_OMAP3430			/* which is in a 3430 */
 #define CONFIG_OMAP3_RX51		/* working with RX51 */
 #define CONFIG_SYS_L2CACHE_OFF		/* pretend there is no L2 CACHE */
include/configs/omap3_evm_common.h +0 -1
index eef4230..8885e17 100644
@@ -13,7 +13,6 @@
  * High level configuration options
  */
 #define CONFIG_OMAP			/* This is TI OMAP core */
-#define CONFIG_OMAP34XX			/* belonging to 34XX family */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
 
include/configs/omap3_logic.h +0 -1
index 717c935..aeb385f 100644
@@ -15,7 +15,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP			/* in a TI OMAP core */
-#define CONFIG_OMAP34XX			/* which is a 34XX */
 #define CONFIG_OMAP3_LOGIC		/* working with Logic OMAP boards */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
include/configs/omap3_mvblx.h +0 -1
index a3dcb15..f3c21c4 100644
@@ -20,7 +20,6 @@
  */
 #define CONFIG_ARMV7		1	/* This is an ARM V7 CPU core */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		1	/* which is a 34XX */
 #define CONFIG_MVBLX		1	/* working with mvBlueLYNX-X */
 #define CONFIG_MACH_TYPE	MACH_TYPE_MVBLX
 #define CONFIG_OMAP_GPIO
include/configs/omap3_pandora.h +0 -1
index c22c1fc..45feeb5 100644
@@ -14,7 +14,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		1	/* which is a 34XX */
 #define CONFIG_OMAP3_PANDORA	1	/* working with pandora */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
include/configs/omap3_sdp3430.h +0 -1
index a3e8a59..ac307eb 100644
@@ -21,7 +21,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP		1	/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		1	/* which is a 34XX */
 #define CONFIG_OMAP3_3430SDP	1	/* working with SDP Rev2 */
 #define CONFIG_OMAP_COMMON
 
include/configs/tam3517-common.h +0 -1
index e1fc754..c2ba0d1 100644
@@ -14,7 +14,6 @@
  * High Level Configuration Options
  */
 #define CONFIG_OMAP		/* in a TI OMAP core */
-#define CONFIG_OMAP34XX		/* which is a 34XX */
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
 
include/configs/tao3530.h +0 -1
index 174bfe5..8d2db27 100644
@@ -18,7 +18,6 @@
  */
 #define CONFIG_ARMV7			/* This is an ARM V7 CPU core */
 #define CONFIG_OMAP			/* in a TI OMAP core */
-#define CONFIG_OMAP34XX			/* which is a 34XX */
 
 #define CONFIG_OMAP_GPIO
 #define CONFIG_OMAP_COMMON
include/configs/ti_omap3_common.h +0 -1
index ade35d2..3b19d3d 100644
@@ -14,7 +14,6 @@
 #ifndef __CONFIG_TI_OMAP3_COMMON_H__
 #define __CONFIG_TI_OMAP3_COMMON_H__
 
-#define CONFIG_OMAP34XX
 
 #include <asm/arch/cpu.h>
 #include <asm/arch/omap3.h>
include/configs/tricorder.h +0 -1
index cc0d172..6ddf3d5 100644
@@ -18,7 +18,6 @@
 
 /* High Level Configuration Options */
 #define CONFIG_OMAP			/* in a TI OMAP core */
-#define CONFIG_OMAP34XX			/* which is a 34XX */
 #define CONFIG_OMAP_COMMON
 
 #define CONFIG_MACH_TYPE		MACH_TYPE_TRICORDER
Signature · 1 line
1.9.1
#17 lore raw

PATCH 9/15 omap3: kconfig: move board select menu and common settings

Quoted 8 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the OMAP3 board select menu to omap3/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="omap3

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140804/5860e4de/attachment.pgp>
#18 lore raw

PATCH 10/15 omap4: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the OMAP4 board select menu to omap4/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="omap4").

---

 arch/arm/Kconfig                  | 15 ++++-----------
 arch/arm/cpu/armv7/omap4/Kconfig  | 29 +++++++++++++++++++++++++++++
 board/gumstix/duovero/Kconfig     |  8 --------
 board/ti/panda/Kconfig            |  8 --------
 board/ti/sdp4430/Kconfig          |  8 --------
 configs/duovero_defconfig         |  1 +
 configs/omap4_panda_defconfig     |  1 +
 configs/omap4_sdp4430_defconfig   |  1 +
 include/configs/ti_omap4_common.h |  1 -
 9 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/omap4/Kconfig
arch/arm/Kconfig +4 -11
index ee29e30..bad0c5d 100644
@@ -403,14 +403,8 @@ config TARGET_HUMMINGBOARD
 config OMAP34XX
 	bool "OMAP34XX SoC"
 
-config TARGET_DUOVERO
-	bool "Support duovero"
-
-config TARGET_OMAP4_PANDA
-	bool "Support omap4_panda"
-
-config TARGET_OMAP4_SDP4430
-	bool "Support omap4_sdp4430"
+config OMAP44XX
+	bool "OMAP44XX SoC"
 
 config TARGET_CM_T54
 	bool "Support cm_t54"
@@ -519,6 +513,8 @@ source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
+source "arch/arm/cpu/armv7/omap4/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -599,7 +595,6 @@ source "board/freescale/mx6slevk/Kconfig"
 source "board/freescale/vf610twr/Kconfig"
 source "board/gateworks/gw_ventana/Kconfig"
 source "board/genesi/mx51_efikamx/Kconfig"
-source "board/gumstix/duovero/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hale/tt01/Kconfig"
@@ -653,8 +648,6 @@ source "board/ti/am43xx/Kconfig"
 source "board/ti/dra7xx/Kconfig"
 source "board/ti/ks2_evm/Kconfig"
 source "board/ti/omap5_uevm/Kconfig"
-source "board/ti/panda/Kconfig"
-source "board/ti/sdp4430/Kconfig"
 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/tnetv107xevm/Kconfig"
arch/arm/cpu/armv7/omap4/Kconfig new file +29 -0
new file mode 100644
index 0000000..20d2c11
@@ -0,0 +1,29 @@
+if OMAP44XX
+
+choice
+	prompt "OMAP4 board select"
+
+config TARGET_DUOVERO
+	bool "OMAP4430 Gumstix Duovero"
+
+config TARGET_OMAP4_PANDA
+	bool "TI OMAP4 PandaBoard"
+
+config TARGET_OMAP4_SDP4430
+	bool "TI OMAP4 SDP4430"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_SOC
+	string
+	default "omap4"
+
+source "board/gumstix/duovero/Kconfig"
+source "board/ti/panda/Kconfig"
+source "board/ti/sdp4430/Kconfig"
+
+endif
board/gumstix/duovero/Kconfig +0 -8
index d1b5c66..f662798 100644
@@ -1,9 +1,5 @@
 if TARGET_DUOVERO
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "duovero"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "gumstix"
 
-config SYS_SOC
-	string
-	default "omap4"
-
 config SYS_CONFIG_NAME
 	string
 	default "duovero"
board/ti/panda/Kconfig +0 -8
index be1307d..b69218b 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP4_PANDA
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "panda"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap4"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap4_panda"
board/ti/sdp4430/Kconfig +0 -8
index 140e1f1..9c1d8fe 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP4_SDP4430
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "sdp4430"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap4"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap4_sdp4430"
configs/duovero_defconfig +1 -0
index b56092a..8591845 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP44XX=y
 +S:CONFIG_TARGET_DUOVERO=y
configs/omap4_panda_defconfig +1 -0
index 1498d17..6afac38 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP44XX=y
 +S:CONFIG_TARGET_OMAP4_PANDA=y
configs/omap4_sdp4430_defconfig +1 -0
index faac317..c771e76 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP44XX=y
 +S:CONFIG_TARGET_OMAP4_SDP4430=y
include/configs/ti_omap4_common.h +0 -1
index 30b02f6..8c7310c 100644
@@ -15,7 +15,6 @@
 /*
  * High Level Configuration Options
  */
-#define CONFIG_OMAP44XX		1	/* which is a 44XX */
 #define CONFIG_OMAP4430		1	/* which is in a 4430 */
 #define CONFIG_MISC_INIT_R
 #define CONFIG_ARCH_CPU_INIT
Signature · 1 line
1.9.1
#19 lore raw

PATCH 10/15 omap4: kconfig: move board select menu and common settings

Quoted 9 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the OMAP4 board select menu to omap4/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="omap4").

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140804/3d28f66a/attachment.pgp>
#20 lore raw

PATCH 11/15 omap5: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the OMAP5 board select menu to omap5/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="omap5").

---

 arch/arm/Kconfig                      | 15 ++++-----------
 arch/arm/cpu/armv7/omap5/Kconfig      | 29 +++++++++++++++++++++++++++++
 board/compulab/cm_t54/Kconfig         |  8 --------
 board/ti/dra7xx/Kconfig               |  8 --------
 board/ti/omap5_uevm/Kconfig           |  8 --------
 configs/cm_t54_defconfig              |  1 +
 configs/dra7xx_evm_defconfig          |  1 +
 configs/dra7xx_evm_qspiboot_defconfig |  1 +
 configs/dra7xx_evm_uart3_defconfig    |  1 +
 configs/omap5_uevm_defconfig          |  1 +
 include/configs/ti_omap5_common.h     |  1 -
 11 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/omap5/Kconfig
arch/arm/Kconfig +4 -11
index bad0c5d..fd8bc59 100644
@@ -406,14 +406,8 @@ config OMAP34XX
 config OMAP44XX
 	bool "OMAP44XX SoC"
 
-config TARGET_CM_T54
-	bool "Support cm_t54"
-
-config TARGET_DRA7XX_EVM
-	bool "Support dra7xx_evm"
-
-config TARGET_OMAP5_UEVM
-	bool "Support omap5_uevm"
+config OMAP54XX
+	bool "OMAP54XX SoC"
 
 config RMOBILE
 	bool "Renesas ARM SoCs"
@@ -515,6 +509,8 @@ source "arch/arm/cpu/armv7/omap3/Kconfig"
 
 source "arch/arm/cpu/armv7/omap4/Kconfig"
 
+source "arch/arm/cpu/armv7/omap5/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -561,7 +557,6 @@ source "board/cirrus/edb93xx/Kconfig"
 source "board/cm4008/Kconfig"
 source "board/cm41xx/Kconfig"
 source "board/compulab/cm_t335/Kconfig"
-source "board/compulab/cm_t54/Kconfig"
 source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/davedenx/qong/Kconfig"
@@ -645,9 +640,7 @@ source "board/syteco/zmx25/Kconfig"
 source "board/taskit/stamp9g20/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
-source "board/ti/dra7xx/Kconfig"
 source "board/ti/ks2_evm/Kconfig"
-source "board/ti/omap5_uevm/Kconfig"
 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/tnetv107xevm/Kconfig"
arch/arm/cpu/armv7/omap5/Kconfig new file +29 -0
new file mode 100644
index 0000000..be80393
@@ -0,0 +1,29 @@
+if OMAP54XX
+
+choice
+	prompt "OMAP5 board select"
+
+config TARGET_CM_T54
+	bool "CompuLab CM-T54"
+
+config TARGET_OMAP5_UEVM
+	bool "TI OMAP5 uEVM board"
+
+config TARGET_DRA7XX_EVM
+	bool "TI DRA7XX"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_SOC
+	string
+	default "omap5"
+
+source "board/compulab/cm_t54/Kconfig"
+source "board/ti/omap5_uevm/Kconfig"
+source "board/ti/dra7xx/Kconfig"
+
+endif
board/compulab/cm_t54/Kconfig +0 -8
index 0fe3692..0edab5c 100644
@@ -1,9 +1,5 @@
 if TARGET_CM_T54
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "cm_t54"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "compulab"
 
-config SYS_SOC
-	string
-	default "omap5"
-
 config SYS_CONFIG_NAME
 	string
 	default "cm_t54"
board/ti/dra7xx/Kconfig +0 -8
index 4b13ef4..9ee13c5 100644
@@ -1,9 +1,5 @@
 if TARGET_DRA7XX_EVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "dra7xx"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap5"
-
 config SYS_CONFIG_NAME
 	string
 	default "dra7xx_evm"
board/ti/omap5_uevm/Kconfig +0 -8
index 7c7d5dc..3592e7b 100644
@@ -1,9 +1,5 @@
 if TARGET_OMAP5_UEVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "omap5_uevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "omap5"
-
 config SYS_CONFIG_NAME
 	string
 	default "omap5_uevm"
configs/cm_t54_defconfig +1 -0
index b48a171..32efaa2 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_CM_T54=y
configs/dra7xx_evm_defconfig +1 -0
index 82cffd7..297c6b5 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_DRA7XX_EVM=y
configs/dra7xx_evm_qspiboot_defconfig +1 -0
index be09f40..92417f2 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,QSPI_BOOT"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_DRA7XX_EVM=y
configs/dra7xx_evm_uart3_defconfig +1 -0
index e0d1e45..3551317 100644
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3,SPL_YMODEM_SUPPORT"
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_DRA7XX_EVM=y
configs/omap5_uevm_defconfig +1 -0
index 7a19ce9..86d5c16 100644
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
 +S:CONFIG_TARGET_OMAP5_UEVM=y
include/configs/ti_omap5_common.h +0 -1
index cb928ab..3166392 100644
@@ -17,7 +17,6 @@
 #ifndef __CONFIG_TI_OMAP5_COMMON_H
 #define __CONFIG_TI_OMAP5_COMMON_H
 
-#define CONFIG_OMAP54XX
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 #define CONFIG_MISC_INIT_R
Signature · 1 line
1.9.1
#21 lore raw

PATCH 11/15 omap5: kconfig: move board select menu and common settings

Quoted 9 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the OMAP5 board select menu to omap5/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="omap5").

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140804/d4c0df4f/attachment.pgp>
#22 lore raw

PATCH 12/15 keystone: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Keystone board select menu to keystone/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="keystone").

Cc Vitaly Andrianov <[email protected]>
Cc Tom Rini <[email protected]>

---

 arch/arm/Kconfig                    | 10 ++++------
 arch/arm/cpu/armv7/keystone/Kconfig | 24 ++++++++++++++++++++++++
 board/ti/ks2_evm/Kconfig            | 16 ----------------
 configs/k2e_evm_defconfig           |  1 +
 configs/k2hk_evm_defconfig          |  1 +
 5 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 arch/arm/cpu/armv7/keystone/Kconfig
arch/arm/Kconfig +4 -6
index fd8bc59..2e8cd2a 100644
@@ -331,11 +331,8 @@ config ARCH_EXYNOS
 config TARGET_HIGHBANK
 	bool "Support highbank"
 
-config TARGET_K2E_EVM
-	bool "Support k2e_evm"
-
-config TARGET_K2HK_EVM
-	bool "Support k2hk_evm"
+config ARCH_KEYSTONE
+	bool "TI Keystone"
 
 config TARGET_M53EVK
 	bool "Support m53evk"
@@ -503,6 +500,8 @@ source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
 
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
+source "arch/arm/cpu/armv7/keystone/Kconfig"
+
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
 
 source "arch/arm/cpu/armv7/omap3/Kconfig"
@@ -640,7 +639,6 @@ source "board/syteco/zmx25/Kconfig"
 source "board/taskit/stamp9g20/Kconfig"
 source "board/ti/am335x/Kconfig"
 source "board/ti/am43xx/Kconfig"
-source "board/ti/ks2_evm/Kconfig"
 source "board/ti/ti814x/Kconfig"
 source "board/ti/ti816x/Kconfig"
 source "board/ti/tnetv107xevm/Kconfig"
arch/arm/cpu/armv7/keystone/Kconfig new file +24 -0
new file mode 100644
index 0000000..24d0cbe
@@ -0,0 +1,24 @@
+if ARCH_KEYSTONE
+
+choice
+	prompt "TI Keystone board select"
+
+config TARGET_K2HK_EVM
+	bool "TI Keystone 2 Kepler/Hawking EVM"
+
+config TARGET_K2E_EVM
+	bool "TI Keystone 2 Edison EVM"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_SOC
+	string
+	default "keystone"
+
+source "board/ti/ks2_evm/Kconfig"
+
+endif
board/ti/ks2_evm/Kconfig +0 -16
index 7890b30..3108782 100644
@@ -1,9 +1,5 @@
 if TARGET_K2E_EVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "ks2_evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "keystone"
-
 config SYS_CONFIG_NAME
 	string
 	default "k2e_evm"
@@ -24,10 +16,6 @@ endif
 
 if TARGET_K2HK_EVM
 
-config SYS_CPU
-	string
-	default "armv7"
-
 config SYS_BOARD
 	string
 	default "ks2_evm"
@@ -36,10 +24,6 @@ config SYS_VENDOR
 	string
 	default "ti"
 
-config SYS_SOC
-	string
-	default "keystone"
-
 config SYS_CONFIG_NAME
 	string
 	default "k2hk_evm"
configs/k2e_evm_defconfig +1 -0
index c210ad5..be8d2ee 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2E_EVM=y
configs/k2hk_evm_defconfig +1 -0
index caa763a..eee3335 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_KEYSTONE=y
 CONFIG_TARGET_K2HK_EVM=y
Signature · 1 line
1.9.1
#23 lore raw

PATCH 12/15 keystone: kconfig: move board select menu and common settings

Quoted 9 lines · Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Keystone board select menu to keystone/Kconfig.

Move also common settings (CONFIG_SYS_CPU="armv7" and CONFIG_SYS_SOC="keystone").

Cc Vitaly Andrianov <[email protected]>
Cc Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140804/ee6502b1/attachment.pgp>
#24 lore raw

PATCH 13/15 orion5x: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Orion5x board select menu to orion5x/Kconfig.

Move also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="orion5x").

---

 arch/arm/Kconfig                       |  7 ++++---
 arch/arm/cpu/arm926ejs/orion5x/Kconfig | 21 +++++++++++++++++++++
 board/LaCie/edminiv2/Kconfig           |  8 --------
 configs/edminiv2_defconfig             |  1 +
 include/configs/edminiv2.h             |  1 -
 5 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/orion5x/Kconfig
arch/arm/Kconfig +4 -3
index 2e8cd2a..74a4e4b 100644
@@ -193,8 +193,8 @@ config TARGET_SC_SPS_1
 config TARGET_NHK8815
 	bool "Support nhk8815"
 
-config TARGET_EDMINIV2
-	bool "Support edminiv2"
+config ORION5X
+	bool "Marvell Orion"
 
 config TARGET_DKB
 	bool "Support dkb"
@@ -510,6 +510,8 @@ source "arch/arm/cpu/armv7/omap4/Kconfig"
 
 source "arch/arm/cpu/armv7/omap5/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/orion5x/Kconfig"
+
 source "arch/arm/cpu/armv7/rmobile/Kconfig"
 
 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
@@ -523,7 +525,6 @@ source "board/BuR/tseries/Kconfig"
 source "board/BuS/eb_cpux9k2/Kconfig"
 source "board/BuS/vl_ma2sc/Kconfig"
 source "board/CarMediaLab/flea3/Kconfig"
-source "board/LaCie/edminiv2/Kconfig"
 source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/dkb/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
arch/arm/cpu/arm926ejs/orion5x/Kconfig new file +21 -0
new file mode 100644
index 0000000..aa40099
@@ -0,0 +1,21 @@
+if ORION5X
+
+choice
+	prompt "Marvell Orion board select"
+
+config TARGET_EDMINIV2
+	bool "LaCie Ethernet Disk mini V2"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_SOC
+	string
+	default "orion5x"
+
+source "board/LaCie/edminiv2/Kconfig"
+
+endif
board/LaCie/edminiv2/Kconfig +0 -8
index f1151d1..9675a9e 100644
@@ -1,9 +1,5 @@
 if TARGET_EDMINIV2
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "edminiv2"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "LaCie"
 
-config SYS_SOC
-	string
-	default "orion5x"
-
 config SYS_CONFIG_NAME
 	string
 	default "edminiv2"
configs/edminiv2_defconfig +1 -0
index 82aa684..3b1a6c1 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ORION5X=y
 CONFIG_TARGET_EDMINIV2=y
include/configs/edminiv2.h +0 -1
index 77717a8..1df4fc1 100644
@@ -25,7 +25,6 @@
 #define CONFIG_MARVELL		1
 #define CONFIG_ARM926EJS	1	/* Basic Architecture */
 #define CONFIG_FEROCEON		1	/* CPU Core subversion */
-#define CONFIG_ORION5X		1	/* SOC Family Name */
 #define CONFIG_88F5182		1	/* SOC Name */
 #define CONFIG_MACH_EDMINIV2	1	/* Machine type */
 
Signature · 1 line
1.9.1
#25 lore raw

PATCH 14/15 highbank: kconfig: move common settings

In reply to Masahiro Yamada

Move Highbank-specific settings to highbank/Kconfig.

---

 arch/arm/Kconfig                               | 7 ++++---
 {board => arch/arm/cpu/armv7}/highbank/Kconfig | 2 +-
 configs/highbank_defconfig                     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)
 rename {board => arch/arm/cpu/armv7}/highbank/Kconfig (90%)
arch/arm/Kconfig +4 -3
index 74a4e4b..3ffadb6 100644
@@ -328,8 +328,8 @@ config TARGET_BCM28155_AP
 config ARCH_EXYNOS
 	bool "Samsung EXYNOS"
 
-config TARGET_HIGHBANK
-	bool "Support highbank"
+config ARCH_HIGHBANK
+	bool "Calxeda Highbank"
 
 config ARCH_KEYSTONE
 	bool "TI Keystone"
@@ -500,6 +500,8 @@ source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
 
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
+source "arch/arm/cpu/armv7/highbank/Kconfig"
+
 source "arch/arm/cpu/armv7/keystone/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
@@ -593,7 +595,6 @@ source "board/genesi/mx51_efikamx/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
 source "board/hale/tt01/Kconfig"
-source "board/highbank/Kconfig"
 source "board/icpdas/lp8x4x/Kconfig"
 source "board/imx31_phycore/Kconfig"
 source "board/isee/igep0033/Kconfig"
arch/arm/cpu/armv7/highbank/Kconfig renamed from board/highbank/Kconfig +1 -1
similarity index 90%
rename from board/highbank/Kconfig
rename to arch/arm/cpu/armv7/highbank/Kconfig
index 1c32490..9527928 100644
@@ -1,4 +1,4 @@
-if TARGET_HIGHBANK
+if ARCH_HIGHBANK
 
 config SYS_CPU
 	string
configs/highbank_defconfig +1 -1
index 23fd52d..88efbdf 100644
@@ -1,2 +1,2 @@
 CONFIG_ARM=y
-CONFIG_TARGET_HIGHBANK=y
+CONFIG_ARCH_HIGHBANK=y
Signature · 1 line
1.9.1
#26 lore raw

PATCH 15/15 nomadik: kconfig: move board select menu and common settings

In reply to Masahiro Yamada

Becuase the board select menu in arch/arm/Kconfig is too big, move the Nomadik board select menu to nomadik/Kconfig.

Move also common settings (CONFIG_SYS_CPU="arm926ejs" and CONFIG_SYS_SOC="nomadik").

---

 arch/arm/Kconfig                       |  7 ++++---
 arch/arm/cpu/arm926ejs/nomadik/Kconfig | 21 +++++++++++++++++++++
 board/st/nhk8815/Kconfig               | 10 +---------
 configs/nhk8815_defconfig              |  3 ++-
 configs/nhk8815_onenand_defconfig      |  3 ++-
 include/configs/nhk8815.h              |  2 --
 6 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 arch/arm/cpu/arm926ejs/nomadik/Kconfig
arch/arm/Kconfig +4 -3
index 3ffadb6..54e78cc 100644
@@ -190,8 +190,8 @@ config TARGET_SANSA_FUZE_PLUS
 config TARGET_SC_SPS_1
 	bool "Support sc_sps_1"
 
-config TARGET_NHK8815
-	bool "Support nhk8815"
+config ARCH_NOMADIK
+	bool "ST-Ericsson Nomadik"
 
 config ORION5X
 	bool "Marvell Orion"
@@ -506,6 +506,8 @@ source "arch/arm/cpu/armv7/keystone/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/nomadik/Kconfig"
+
 source "arch/arm/cpu/armv7/omap3/Kconfig"
 
 source "arch/arm/cpu/armv7/omap4/Kconfig"
@@ -634,7 +636,6 @@ source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st-ericsson/snowball/Kconfig"
 source "board/st-ericsson/u8500/Kconfig"
-source "board/st/nhk8815/Kconfig"
 source "board/sunxi/Kconfig"
 source "board/syteco/jadecpu/Kconfig"
 source "board/syteco/zmx25/Kconfig"
arch/arm/cpu/arm926ejs/nomadik/Kconfig new file +21 -0
new file mode 100644
index 0000000..7177800
@@ -0,0 +1,21 @@
+if ARCH_NOMADIK
+
+choice
+	prompt "Nomadik board select"
+
+config NOMADIK_NHK8815
+	bool "ST 8815 Nomadik Hardware Kit"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_SOC
+	string
+	default "nomadik"
+
+source "board/st/nhk8815/Kconfig"
+
+endif
board/st/nhk8815/Kconfig +1 -9
index ec3f880..ba2e7c2 100644
@@ -1,8 +1,4 @@
-if TARGET_NHK8815
-
-config SYS_CPU
-	string
-	default "arm926ejs"
+if NOMADIK_NHK8815
 
 config SYS_BOARD
 	string
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "st"
 
-config SYS_SOC
-	string
-	default "nomadik"
-
 config SYS_CONFIG_NAME
 	string
 	default "nhk8815"
configs/nhk8815_defconfig +2 -1
index 3d20199..f661226 100644
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
-CONFIG_TARGET_NHK8815=y
+CONFIG_ARCH_NOMADIK=y
+CONFIG_NOMADIK_NHK8815=y
configs/nhk8815_onenand_defconfig +2 -1
index 860ae92..dd8048d 100644
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="BOOT_ONENAND"
 CONFIG_ARM=y
-CONFIG_TARGET_NHK8815=y
+CONFIG_ARCH_NOMADIK=y
+CONFIG_NOMADIK_NHK8815=y
include/configs/nhk8815.h +0 -2
index 4d3428c..5419f55 100644
@@ -13,9 +13,7 @@
 #include <nomadik.h>
 
 #define CONFIG_ARM926EJS
-#define CONFIG_NOMADIK
 #define CONFIG_NOMADIK_8815	/* cpu variant */
-#define CONFIG_NOMADIK_NHK8815	/* board variant */
 
 #define CONFIG_SKIP_LOWLEVEL_INIT /* we have already been loaded to RAM */
 
Signature · 1 line
1.9.1
#27 lore raw

cover arm: kconfig: move board select menus and other settings to SoC dir

In reply to Masahiro Yamada
Quoted 21 lines · Masahiro Yamada

There are lots of boards supported in ARM architecture. The board select menu in arch/arm/Kconfig is already too fat.

This series introduces platform select between arch select and board select.

ARCH select (ARM)
|-- Platform select
|-- Board select

Many (not all) of boards have been moved to $(SOC)/Kconfig.

I built all the boards and confirmed the same binareis are produced with/without thie series.

Prerequisites
-------------
Apply
http://patchwork.ozlabs.org/patch/374416/
to avoid a conflict in doc/README.scrapyard

Quoted 4 lines

Apply
http://patchwork.ozlabs.org/patch/375467/
to avoid a conflict in configs/jetson-tk1_defconfig

Any repo/branch will be more then helpful.

Thanks,
Michal

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140805/089d8b16/attachment.pgp>
#28 lore raw

cover arm: kconfig: move board select menus and other settings to SoC dir

Hi Michal,

Quoted 22 lines · On Tue, 05 Aug 2014 11:04:14 +0200 Michal Simek <[email protected]> wrote:
Quoted 21 lines · Masahiro Yamada

There are lots of boards supported in ARM architecture. The board select menu in arch/arm/Kconfig is already too fat.

This series introduces platform select between arch select and board select.

ARCH select (ARM)
|-- Platform select
|-- Board select

Many (not all) of boards have been moved to $(SOC)/Kconfig.

I built all the boards and confirmed the same binareis are produced with/without thie series.

Prerequisites
-------------
Apply
http://patchwork.ozlabs.org/patch/374416/
to avoid a conflict in doc/README.scrapyard

Quoted 6 lines
Quoted 4 lines

Apply
http://patchwork.ozlabs.org/patch/375467/
to avoid a conflict in configs/jetson-tk1_defconfig

Any repo/branch will be more then helpful.

OK. Please try:

git clone git://github.com/masahir0y/u-boot-kbuild.git
cd u-boot-kbuild
git checkout arm-refactor

Best Regards
Masahiro Yamada