* [U-Boot] [PATCH v2 01/15] omap: remove omap5912osk board support
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-23 12:45 ` [U-Boot] [U-Boot, v2, " Tom Rini
2014-08-06 3:17 ` [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and common settings Masahiro Yamada
` (14 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
Emails to the board maintainer
"Rishi Bhattacharya <rishi@ti.com>"
have been bouncing.
Tom suggested to remove this board.
Remove also omap1510_udc.c because this is the last board
to enable it.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Suggested-by: Tom Rini <trini@ti.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e385eda..e97f94d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/board/ti/omap5912osk/Kconfig b/board/ti/omap5912osk/Kconfig
deleted file mode 100644
index 9f7493a..0000000
--- a/board/ti/omap5912osk/Kconfig
+++ /dev/null
@@ -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
diff --git a/board/ti/omap5912osk/MAINTAINERS b/board/ti/omap5912osk/MAINTAINERS
deleted file mode 100644
index 43ffb9b..0000000
--- a/board/ti/omap5912osk/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-OMAP5912OSK BOARD
-M: Rishi Bhattacharya <rishi@ti.com>
-S: Maintained
-F: board/ti/omap5912osk/
-F: include/configs/omap5912osk.h
-F: configs/omap5912osk_defconfig
diff --git a/board/ti/omap5912osk/Makefile b/board/ti/omap5912osk/Makefile
deleted file mode 100644
index d7c0ebd..0000000
--- a/board/ti/omap5912osk/Makefile
+++ /dev/null
@@ -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
diff --git a/board/ti/omap5912osk/config.mk b/board/ti/omap5912osk/config.mk
deleted file mode 100644
index 5b8d952..0000000
--- a/board/ti/omap5912osk/config.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# (C) Copyright 2002-2004
-# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
-# David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
-#
-# (C) Copyright 2003
-# Texas Instruments, <www.ti.com>
-# Kshitij Gupta <Kshitij@ti.com>
-#
-# (C) Copyright 2004
-# Texas Instruments, <www.ti.com>
-# Rishi Bhattacharya <rishi@ti.com>
-#
-# 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
diff --git a/board/ti/omap5912osk/lowlevel_init.S b/board/ti/omap5912osk/lowlevel_init.S
deleted file mode 100644
index e05a1c7..0000000
--- a/board/ti/omap5912osk/lowlevel_init.S
+++ /dev/null
@@ -1,477 +0,0 @@
-/*
- * Board specific setup info
- *
- * (C) Copyright 2003
- * Texas Instruments, <www.ti.com>
- * Kshitij Gupta <Kshitij@ti.com>
- *
- * Modified for OMAP 1610 H2 board by Nishant Kamat, Jan 2004
- *
- * Modified for OMAP 5912 OSK board by Rishi Bhattacharya, Apr 2004
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <config.h>
-#include <version.h>
-
-#if defined(CONFIG_OMAP1610)
-#include <./configs/omap1510.h>
-#endif
-
-.globl lowlevel_init
-lowlevel_init:
-
- /*------------------------------------------------------*
- * Ensure i-cache is enabled *
- * To configure TC regs without fetching instruction *
- *------------------------------------------------------*/
- mrc p15, 0, r0, c1, c0
- orr r0, r0, #0x1000
- mcr p15, 0, r0, c1, c0
-
- /*------------------------------------------------------*
- *mask all IRQs by setting all bits in the INTMR default*
- *------------------------------------------------------*/
- mov r1, #0xffffffff
- ldr r0, =REG_IHL1_MIR
- str r1, [r0]
- ldr r0, =REG_IHL2_MIR
- str r1, [r0]
-
- /*------------------------------------------------------*
- * Set up ARM CLM registers (IDLECT1) *
- *------------------------------------------------------*/
- ldr r0, REG_ARM_IDLECT1
- ldr r1, VAL_ARM_IDLECT1
- str r1, [r0]
-
- /*------------------------------------------------------*
- * Set up ARM CLM registers (IDLECT2) *
- *------------------------------------------------------*/
- ldr r0, REG_ARM_IDLECT2
- ldr r1, VAL_ARM_IDLECT2
- str r1, [r0]
-
- /*------------------------------------------------------*
- * Set up ARM CLM registers (IDLECT3) *
- *------------------------------------------------------*/
- ldr r0, REG_ARM_IDLECT3
- ldr r1, VAL_ARM_IDLECT3
- str r1, [r0]
-
- mov r1, #0x01 /* PER_EN bit */
- ldr r0, REG_ARM_RSTCT2
- strh r1, [r0] /* CLKM; Peripheral reset. */
-
- /* Set CLKM to Sync-Scalable */
- mov r1, #0x1000
- ldr r0, REG_ARM_SYSST
-
- mov r2, #0
-1: cmp r2, #1
- streqh r1, [r0]
- add r2, r2, #1
- cmp r2, #0x100 /* wait for any bubbles to finish */
- bne 1b
-
- ldr r1, VAL_ARM_CKCTL
- ldr r0, REG_ARM_CKCTL
- strh r1, [r0]
-
- /* a few nops to let settle */
- nop
- nop
- nop
- nop
- nop
- nop
- nop
- nop
- nop
- nop
-
- /* setup DPLL 1 */
- /* Ramp up the clock to 96Mhz */
- ldr r1, VAL_DPLL1_CTL
- ldr r0, REG_DPLL1_CTL
- strh r1, [r0]
- ands r1, r1, #0x10 /* Check if PLL is enabled. */
- beq lock_end /* Do not look for lock if BYPASS selected */
-2:
- ldrh r1, [r0]
- ands r1, r1, #0x01 /* Check the LOCK bit.*/
- beq 2b /* loop until bit goes hi. */
-lock_end:
-
- /*------------------------------------------------------*
- * Turn off the watchdog during init... *
- *------------------------------------------------------*/
- ldr r0, REG_WATCHDOG
- ldr r1, WATCHDOG_VAL1
- str r1, [r0]
- ldr r1, WATCHDOG_VAL2
- str r1, [r0]
- ldr r0, REG_WSPRDOG
- ldr r1, WSPRDOG_VAL1
- str r1, [r0]
- ldr r0, REG_WWPSDOG
-
-watch1Wait:
- ldr r1, [r0]
- tst r1, #0x10
- bne watch1Wait
-
- ldr r0, REG_WSPRDOG
- ldr r1, WSPRDOG_VAL2
- str r1, [r0]
- ldr r0, REG_WWPSDOG
-watch2Wait:
- ldr r1, [r0]
- tst r1, #0x10
- bne watch2Wait
-
- /* Set memory timings corresponding to the new clock speed */
- ldr r3, VAL_SDRAM_CONFIG_SDF0
-
- /* Check execution location to determine current execution location
- * and branch to appropriate initialization code.
- */
- mov r0, #0x10000000 /* Load physical SDRAM base. */
- mov r1, pc /* Get current execution location. */
- cmp r1, r0 /* Compare. */
- bge skip_sdram /* Skip over EMIF-fast initialization if running from SDRAM. */
-
- /* identify the device revision, -- TMX or TMP(TMS) */
- ldr r0, REG_DEVICE_ID
- ldr r1, [r0]
-
- ldr r0, VAL_DEVICE_ID_TMP
- mov r1, r1, lsl #15
- mov r1, r1, lsr #16
- cmp r0, r1
- bne skip_TMP_Patch
-
- /* Enable TMP/TMS device new features */
- mov r0, #1
- ldr r1, REG_TC_EMIFF_DOUBLER
- str r0, [r1]
-
- /* Enable new ac parameters */
- mov r0, #0x0b
- ldr r1, REG_SDRAM_CONFIG2
- str r0, [r1]
-
- ldr r3, VAL_SDRAM_CONFIG_SDF1
-
-skip_TMP_Patch:
-
- /*
- * Delay for SDRAM initialization.
- */
- mov r0, #0x1800 /* value should be checked */
-3:
- subs r0, r0, #0x1 /* Decrement count */
- bne 3b
-
- /*
- * Set SDRAM control values. Disable refresh before MRS command.
- */
-
- /* mobile ddr operation */
- ldr r0, REG_SDRAM_OPERATION
- mov r2, #07
- str r2, [r0]
-
- /* config register */
- ldr r0, REG_SDRAM_CONFIG
- str r3, [r0]
-
- /* manual command register */
- ldr r0, REG_SDRAM_MANUAL_CMD
-
- /* issue set cke high */
- mov r1, #CMD_SDRAM_CKE_SET_HIGH
- str r1, [r0]
-
- /* issue nop */
- mov r1, #CMD_SDRAM_NOP
- str r1, [r0]
-
- mov r2, #0x0100
-waitMDDR1:
- subs r2, r2, #1
- bne waitMDDR1 /* delay loop */
-
- /* issue precharge */
- mov r1, #CMD_SDRAM_PRECHARGE
- str r1, [r0]
-
- /* issue autorefresh x 2 */
- mov r1, #CMD_SDRAM_AUTOREFRESH
- str r1, [r0]
- str r1, [r0]
-
- /* mrs register ddr mobile */
- ldr r0, REG_SDRAM_MRS
- mov r1, #0x33
- str r1, [r0]
-
- /* emrs1 low-power register */
- ldr r0, REG_SDRAM_EMRS1
- /* self refresh on all banks */
- mov r1, #0
- str r1, [r0]
-
- ldr r0, REG_DLL_URD_CONTROL
- ldr r1, DLL_URD_CONTROL_VAL
- str r1, [r0]
-
- ldr r0, REG_DLL_LRD_CONTROL
- ldr r1, DLL_LRD_CONTROL_VAL
- str r1, [r0]
-
- ldr r0, REG_DLL_WRT_CONTROL
- ldr r1, DLL_WRT_CONTROL_VAL
- str r1, [r0]
-
- /* delay loop */
- mov r0, #0x0100
-waitMDDR2:
- subs r0, r0, #1
- bne waitMDDR2
-
- /*
- * Delay for SDRAM initialization.
- */
- mov r0, #0x1800
-4:
- subs r0, r0, #1 /* Decrement count. */
- bne 4b
- b common_tc
-
-skip_sdram:
- ldr r0, REG_SDRAM_CONFIG
- str r3, [r0]
-
-common_tc:
- /* slow interface */
- ldr r1, VAL_TC_EMIFS_CS0_CONFIG
- ldr r0, REG_TC_EMIFS_CS0_CONFIG
- str r1, [r0] /* Chip Select 0 */
-
- ldr r1, VAL_TC_EMIFS_CS1_CONFIG
- ldr r0, REG_TC_EMIFS_CS1_CONFIG
- str r1, [r0] /* Chip Select 1 */
-
- ldr r1, VAL_TC_EMIFS_CS3_CONFIG
- ldr r0, REG_TC_EMIFS_CS3_CONFIG
- str r1, [r0] /* Chip Select 3 */
-
- ldr r1, VAL_TC_EMIFS_DWS
- ldr r0, REG_TC_EMIFS_DWS
- str r1, [r0] /* Enable EMIFS.RDY for CS1 (ether) */
-
-#ifdef CONFIG_H2_OMAP1610
- /* inserting additional 2 clock cycle hold time for LAN */
- ldr r0, REG_TC_EMIFS_CS1_ADVANCED
- ldr r1, VAL_TC_EMIFS_CS1_ADVANCED
- str r1, [r0]
-#endif
- /* Start MPU Timer 1 */
- ldr r0, REG_MPU_LOAD_TIMER
- ldr r1, VAL_MPU_LOAD_TIMER
- str r1, [r0]
-
- ldr r0, REG_MPU_CNTL_TIMER
- ldr r1, VAL_MPU_CNTL_TIMER
- str r1, [r0]
-
- /*
- * Setup a temporary stack
- */
- ldr sp, SRAM_STACK
- bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
-
- /*
- * Save the old lr(passed in ip) and the current lr to stack
- */
- push {ip, lr}
-
- /*
- * go setup pll, mux, memory
- */
- bl s_init
- pop {ip, pc}
-
- /* back to arch calling code */
- mov pc, lr
-
- /* the literal pools origin */
- .ltorg
-
-REG_DEVICE_ID: /* 32 bits */
- .word 0xfffe2004
-REG_TC_EMIFS_CONFIG:
- .word 0xfffecc0c
-REG_TC_EMIFS_CS0_CONFIG: /* 32 bits */
- .word 0xfffecc10
-REG_TC_EMIFS_CS1_CONFIG: /* 32 bits */
- .word 0xfffecc14
-REG_TC_EMIFS_CS2_CONFIG: /* 32 bits */
- .word 0xfffecc18
-REG_TC_EMIFS_CS3_CONFIG: /* 32 bits */
- .word 0xfffecc1c
-REG_TC_EMIFS_DWS: /* 32 bits */
- .word 0xfffecc40
-#ifdef CONFIG_H2_OMAP1610
-REG_TC_EMIFS_CS1_ADVANCED: /* 32 bits */
- .word 0xfffecc54
-#endif
-
-/* MPU clock/reset/power mode control registers */
-REG_ARM_CKCTL: /* 16 bits */
- .word 0xfffece00
-REG_ARM_IDLECT3: /* 16 bits */
- .word 0xfffece24
-REG_ARM_IDLECT2: /* 16 bits */
- .word 0xfffece08
-REG_ARM_IDLECT1: /* 16 bits */
- .word 0xfffece04
-REG_ARM_RSTCT2: /* 16 bits */
- .word 0xfffece14
-REG_ARM_SYSST: /* 16 bits */
- .word 0xfffece18
-
-/* DPLL control registers */
-REG_DPLL1_CTL: /* 16 bits */
- .word 0xfffecf00
-
-/* Watch Dog register */
-/* secure watchdog stop */
-REG_WSPRDOG:
- .word 0xfffeb048
-/* watchdog write pending */
-REG_WWPSDOG:
- .word 0xfffeb034
-
-WSPRDOG_VAL1:
- .word 0x0000aaaa
-WSPRDOG_VAL2:
- .word 0x00005555
-
-/* SDRAM config is: auto refresh enabled, 16 bit 4 bank,
- counter @8192 rows, 10 ns, 8 burst */
-REG_SDRAM_CONFIG:
- .word 0xfffecc20
-REG_SDRAM_CONFIG2:
- .word 0xfffecc3c
-REG_TC_EMIFF_DOUBLER: /* 32 bits */
- .word 0xfffecc60
-
-/* Operation register */
-REG_SDRAM_OPERATION:
- .word 0xfffecc80
-
-/* Manual command register */
-REG_SDRAM_MANUAL_CMD:
- .word 0xfffecc84
-
-/* SDRAM MRS (New) config is: CAS latency is 2, burst length 8 */
-REG_SDRAM_MRS:
- .word 0xfffecc70
-
-/* SDRAM MRS (New) config is: CAS latency is 2, burst length 8 */
-REG_SDRAM_EMRS1:
- .word 0xfffecc78
-
-/* WRT DLL register */
-REG_DLL_WRT_CONTROL:
- .word 0xfffecc68
-DLL_WRT_CONTROL_VAL:
- .word 0x03f00002 /* Phase of 72deg, write offset +31 */
-
-/* URD DLL register */
-REG_DLL_URD_CONTROL:
- .word 0xfffeccc0
-DLL_URD_CONTROL_VAL:
- .word 0x00800002 /* Phase of 72deg, read offset +31 */
-
-/* LRD DLL register */
-REG_DLL_LRD_CONTROL:
- .word 0xfffecccc
-DLL_LRD_CONTROL_VAL:
- .word 0x00800002 /* read offset +31 */
-
-REG_WATCHDOG:
- .word 0xfffec808
-WATCHDOG_VAL1:
- .word 0x000000f5
-WATCHDOG_VAL2:
- .word 0x000000a0
-
-REG_MPU_LOAD_TIMER:
- .word 0xfffec504
-REG_MPU_CNTL_TIMER:
- .word 0xfffec500
-VAL_MPU_LOAD_TIMER:
- .word 0xffffffff
-VAL_MPU_CNTL_TIMER:
- .word 0xffffffa1
-
-/* 96 MHz Samsung Mobile DDR */
-/* Original setting for TMX device */
-VAL_SDRAM_CONFIG_SDF0:
- .word 0x0014e6fe
-
-/* NEW_SYS_FREQ mode (valid only TMP/TMS devices) */
-VAL_SDRAM_CONFIG_SDF1:
- .word 0x0114e6fe
-
-VAL_ARM_CKCTL:
- .word 0x2000 /* was: 0x3000, now use CLK_REF for timer input */
-VAL_DPLL1_CTL:
- .word 0x2830
-
-#ifdef CONFIG_OSK_OMAP5912
-VAL_TC_EMIFS_CS0_CONFIG:
- .word 0x002130b0
-VAL_TC_EMIFS_CS1_CONFIG:
- .word 0x00001133
-VAL_TC_EMIFS_CS2_CONFIG:
- .word 0x000055f0
-VAL_TC_EMIFS_CS3_CONFIG:
- .word 0x88013141
-VAL_TC_EMIFS_DWS: /* Enable EMIFS.RDY for CS1 access (ether) */
- .word 0x000000c0
-VAL_DEVICE_ID_TMP: /* TMP/TMS=0xb65f, TMX=0xb58c */
- .word 0xb65f
-#endif
-
-#ifdef CONFIG_H2_OMAP1610
-VAL_TC_EMIFS_CS0_CONFIG:
- .word 0x00203331
-VAL_TC_EMIFS_CS1_CONFIG:
- .word 0x8180fff3
-VAL_TC_EMIFS_CS2_CONFIG:
- .word 0xf800f22a
-VAL_TC_EMIFS_CS3_CONFIG:
- .word 0x88013141
-VAL_TC_EMIFS_CS1_ADVANCED:
- .word 0x00000022
-#endif
-
-VAL_ARM_IDLECT1:
- .word 0x00000400
-VAL_ARM_IDLECT2:
- .word 0x00000886
-VAL_ARM_IDLECT3:
- .word 0x00000015
-
-SRAM_STACK:
- .word CONFIG_SYS_INIT_SP_ADDR
-
-/* command values */
-.equ CMD_SDRAM_NOP, 0x00000000
-.equ CMD_SDRAM_PRECHARGE, 0x00000001
-.equ CMD_SDRAM_AUTOREFRESH, 0x00000002
-.equ CMD_SDRAM_CKE_SET_HIGH, 0x00000007
diff --git a/board/ti/omap5912osk/omap5912osk.c b/board/ti/omap5912osk/omap5912osk.c
deleted file mode 100644
index 88a7310..0000000
--- a/board/ti/omap5912osk/omap5912osk.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- *
- * (C) Copyright 2002
- * David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
- *
- * (C) Copyright 2003
- * Texas Instruments, <www.ti.com>
- * Kshitij Gupta <Kshitij@ti.com>
- *
- * (C) Copyright 2004
- * Texas Instruments, <www.ti.com>
- * Rishi Bhattacharya <rishi@ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <netdev.h>
-#if defined(CONFIG_OMAP1610)
-#include <./configs/omap1510.h>
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-void flash__init (void);
-void ether__init (void);
-void set_muxconf_regs (void);
-void peripheral_power_enable (void);
-
-#define COMP_MODE_ENABLE ((unsigned int)0x0000EAEF)
-
-static inline void delay (unsigned long loops)
-{
- __asm__ volatile ("1:\n"
- "subs %0, %1, #1\n"
- "bne 1b":"=r" (loops):"0" (loops));
-}
-
-/*
- * Miscellaneous platform dependent initialisations
- */
-
-int board_init (void)
-{
- gd->bd->bi_arch_number = MACH_TYPE_OMAP_OSK;
-
- /* adress of boot parameters */
- gd->bd->bi_boot_params = 0x10000100;
-
- flash__init();
- ether__init();
-
- return 0;
-}
-
-void s_init(void)
-{
- /* Configure MUX settings */
- set_muxconf_regs ();
- peripheral_power_enable ();
-
-/* this speeds up your boot a quite a bit. However to make it
- * work, you need make sure your kernel startup flush bug is fixed.
- * ... rkw ...
- */
- icache_enable ();
-}
-
-/******************************
- Routine:
- Description:
-******************************/
-void flash__init (void)
-{
-#define EMIFS_GlB_Config_REG 0xfffecc0c
- unsigned int regval;
- regval = *((volatile unsigned int *) EMIFS_GlB_Config_REG);
- /* Turn off write protection for flash devices. */
- regval = regval | 0x0001;
- *((volatile unsigned int *) EMIFS_GlB_Config_REG) = regval;
-}
-/*************************************************************
- Routine:ether__init
- Description: take the Ethernet controller out of reset and wait
- for the EEPROM load to complete.
-*************************************************************/
-void ether__init (void)
-{
-#define ETH_CONTROL_REG 0x0480000b
- int i;
-
- *((volatile unsigned short *) 0xfffece08) = 0x03FF;
- *((volatile unsigned short *) 0xfffb3824) = 0x8000;
- *((volatile unsigned short *) 0xfffb3830) = 0x0000;
- *((volatile unsigned short *) 0xfffb3834) = 0x0009;
- *((volatile unsigned short *) 0xfffb3838) = 0x0009;
- *((volatile unsigned short *) 0xfffb3818) = 0x0002;
- *((volatile unsigned short *) 0xfffb382C) = 0x0048;
- *((volatile unsigned short *) 0xfffb3824) = 0x8603;
- udelay (3);
- for (i=0;i<2000;i++);
- *((volatile unsigned short *) 0xfffb381C) = 0x6610;
- udelay (30);
- for (i=0;i<10000;i++);
-
- *((volatile unsigned char *) ETH_CONTROL_REG) &= ~0x01;
- udelay (3);
-
-
-}
-
-/******************************
- Routine:
- Description:
-******************************/
-int dram_init(void)
-{
- gd->ram_size = get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
-
- return 0;
-}
-
-void dram_init_banksize(void)
-{
- gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
- gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-}
-
-/******************************************************
- Routine: set_muxconf_regs
- Description: Setting up the configuration Mux registers
- specific to the hardware
-*******************************************************/
-void set_muxconf_regs (void)
-{
- volatile unsigned int *MuxConfReg;
- /* set each registers to its reset value; */
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_0);
- /* setup for UART1 */
- *MuxConfReg &= ~(0x02000000); /* bit 25 */
- /* setup for UART2 */
- *MuxConfReg &= ~(0x01000000); /* bit 24 */
- /* Disable Uwire CS Hi-Z */
- *MuxConfReg |= 0x08000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_3);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_4);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_5);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_6);
- /*setup mux for UART3 */
- *MuxConfReg |= 0x00000001; /* bit3, 1, 0 (mux0 5,5,26) */
- *MuxConfReg &= ~0x0000003e;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_7);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_8);
- /* Disable Uwire CS Hi-Z */
- *MuxConfReg |= 0x00001200; /*bit 9 for CS0 12 for CS3 */
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_9);
- /* Need to turn on bits 21 and 12 in FUNC_MUX_CTRL_9 so the */
- /* hardware will actually use TX and RTS based on bit 25 in */
- /* FUNC_MUX_CTRL_0. I told you this thing was screwy! */
- *MuxConfReg |= 0x00201000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_A);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_B);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_C);
- /* setup for UART2 */
- /* Need to turn on bits 27 and 24 in FUNC_MUX_CTRL_C so the */
- /* hardware will actually use TX and RTS based on bit 24 in */
- /* FUNC_MUX_CTRL_0. */
- *MuxConfReg |= 0x09000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_D);
- *MuxConfReg |= 0x00000020;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PULL_DWN_CTRL_0);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PULL_DWN_CTRL_1);
- *MuxConfReg = 0x00000000;
- /* mux setup for SD/MMC driver */
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PULL_DWN_CTRL_2);
- *MuxConfReg &= 0xFFFE0FFF;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PULL_DWN_CTRL_3);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) MOD_CONF_CTRL_0);
- /* bit 13 for MMC2 XOR_CLK */
- *MuxConfReg &= ~(0x00002000);
- /* bit 29 for UART 1 */
- *MuxConfReg &= ~(0x00002000);
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) FUNC_MUX_CTRL_0);
- /* Configure for USB. Turn on VBUS_CTRL and VBUS_MODE. */
- *MuxConfReg |= 0x000C0000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int)USB_TRANSCEIVER_CTRL);
- *MuxConfReg &= ~(0x00000070);
- *MuxConfReg &= ~(0x00000008);
- *MuxConfReg |= 0x00000003;
- *MuxConfReg |= 0x00000180;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) MOD_CONF_CTRL_0);
- /* bit 17, software controls VBUS */
- *MuxConfReg &= ~(0x00020000);
- /* Enable USB 48 and 12M clocks */
- *MuxConfReg |= 0x00000200;
- *MuxConfReg &= ~(0x00000180);
- /*2.75V for MMCSDIO1 */
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) VOLTAGE_CTRL_0);
- *MuxConfReg = 0x00001FE7;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PU_PD_SEL_0);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PU_PD_SEL_1);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PU_PD_SEL_2);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PU_PD_SEL_3);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PU_PD_SEL_4);
- *MuxConfReg = 0x00000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PULL_DWN_CTRL_4);
- *MuxConfReg = 0x00000000;
- /* Turn on UART2 48 MHZ clock */
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) MOD_CONF_CTRL_0);
- *MuxConfReg |= 0x40000000;
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) USB_OTG_CTRL);
- /* setup for USB VBus detection OMAP161x */
- *MuxConfReg |= 0x00040000; /* bit 18 */
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int) PU_PD_SEL_2);
- /* PullUps for SD/MMC driver */
- *MuxConfReg |= ~(0xFFFE0FFF);
- MuxConfReg =
- (volatile unsigned int *) ((unsigned int)COMP_MODE_CTRL_0);
- *MuxConfReg = COMP_MODE_ENABLE;
-}
-
-/******************************************************
- Routine: peripheral_power_enable
- Description: Enable the power for UART1
-*******************************************************/
-void peripheral_power_enable (void)
-{
-#define UART1_48MHZ_ENABLE ((unsigned short)0x0200)
-#define SW_CLOCK_REQUEST ((volatile unsigned short *)0xFFFE0834)
-
- *SW_CLOCK_REQUEST |= UART1_48MHZ_ENABLE;
-}
-
-/*
- * Check Board Identity
- */
-int checkboard(void)
-{
- char buf[64];
- int i = getenv_f("serial#", buf, sizeof(buf));
-
- puts("Board: OSK5912");
-
- if (i > 0) {
- puts(", serial# ");
- puts(buf);
- }
- putc('\n');
-
- return (0);
-}
-
-#ifdef CONFIG_CMD_NET
-int board_eth_init(bd_t *bis)
-{
- int rc = 0;
-#ifdef CONFIG_LAN91C96
- rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
-#endif
- return rc;
-}
-#endif
diff --git a/configs/omap5912osk_defconfig b/configs/omap5912osk_defconfig
deleted file mode 100644
index 5aeb097..0000000
--- a/configs/omap5912osk_defconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_ARM=y
-CONFIG_TARGET_OMAP5912OSK=y
diff --git a/doc/README.scrapyard b/doc/README.scrapyard
index b950a41..6f28ab0 100644
--- a/doc/README.scrapyard
+++ b/doc/README.scrapyard
@@ -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 <rishi@ti.com>
p1023rds powerpc mpc85xx d0bc5140 2014-07-22 Roy Zang <tie-fei.zang@freescale.com>
spc1920 powerpc mpc8xx 98ad54be 2014-07-07
v37 powerpc mpc8xx b8c1438a 2014-07-07
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 4eea907..2efd5a4 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -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
diff --git a/drivers/usb/gadget/omap1510_udc.c b/drivers/usb/gadget/omap1510_udc.c
deleted file mode 100644
index 959df8c..0000000
--- a/drivers/usb/gadget/omap1510_udc.c
+++ /dev/null
@@ -1,1506 +0,0 @@
-/*
- * (C) Copyright 2003
- * Gerry Hamel, geh at ti.com, Texas Instruments
- *
- * Based on
- * linux/drivers/usb/device/bi/omap.c
- * TI OMAP1510 USB bus interface driver
- *
- * Author: MontaVista Software, Inc.
- * source at mvista.com
- * (C) Copyright 2002
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <usbdevice.h>
-#include <usb/omap1510_udc.h>
-#include <usb/udc.h>
-
-#include "ep0.h"
-
-
-#define UDC_INIT_MDELAY 80 /* Device settle delay */
-#define UDC_MAX_ENDPOINTS 31 /* Number of endpoints on this UDC */
-
-/* Some kind of debugging output... */
-#if 1
-#define UDCDBG(str)
-#define UDCDBGA(fmt,args...)
-#else /* The bugs still exists... */
-#define UDCDBG(str) serial_printf("[%s] %s:%d: " str "\n", __FILE__,__FUNCTION__,__LINE__)
-#define UDCDBGA(fmt,args...) serial_printf("[%s] %s:%d: " fmt "\n", __FILE__,__FUNCTION__,__LINE__, ##args)
-#endif
-
-#if 1
-#define UDCREG(name)
-#define UDCREGL(name)
-#else /* The bugs still exists... */
-#define UDCREG(name) serial_printf("%s():%d: %s[%08x]=%.4x\n",__FUNCTION__,__LINE__, (#name), name, inw(name)) /* For 16-bit regs */
-#define UDCREGL(name) serial_printf("%s():%d: %s[%08x]=%.8x\n",__FUNCTION__,__LINE__, (#name), name, inl(name)) /* For 32-bit regs */
-#endif
-
-
-static struct urb *ep0_urb = NULL;
-
-static struct usb_device_instance *udc_device; /* Used in interrupt handler */
-static u16 udc_devstat = 0; /* UDC status (DEVSTAT) */
-static u32 udc_interrupts = 0;
-
-static void udc_stall_ep (unsigned int ep_addr);
-
-
-static struct usb_endpoint_instance *omap1510_find_ep (int ep)
-{
- int i;
-
- for (i = 0; i < udc_device->bus->max_endpoints; i++) {
- if (udc_device->bus->endpoint_array[i].endpoint_address == ep)
- return &udc_device->bus->endpoint_array[i];
- }
- return NULL;
-}
-
-/* ************************************************************************** */
-/* IO
- */
-
-/*
- * omap1510_prepare_endpoint_for_rx
- *
- * This function implements TRM Figure 14-11.
- *
- * The endpoint to prepare for transfer is specified as a physical endpoint
- * number. For OUT (rx) endpoints 1 through 15, the corresponding endpoint
- * configuration register is checked to see if the endpoint is ISO or not.
- * If the OUT endpoint is valid and is non-ISO then its FIFO is enabled.
- * No action is taken for endpoint 0 or for IN (tx) endpoints 16 through 30.
- */
-static void omap1510_prepare_endpoint_for_rx (int ep_addr)
-{
- int ep_num = ep_addr & USB_ENDPOINT_NUMBER_MASK;
-
- UDCDBGA ("omap1510_prepare_endpoint %x", ep_addr);
- if (((ep_addr & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT)) {
- if ((inw (UDC_EP_RX (ep_num)) &
- (UDC_EPn_RX_Valid | UDC_EPn_RX_Iso)) ==
- UDC_EPn_RX_Valid) {
- /* rx endpoint is valid, non-ISO, so enable its FIFO */
- outw (UDC_EP_Sel | ep_num, UDC_EP_NUM);
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- outw (0, UDC_EP_NUM);
- }
- }
-}
-
-/* omap1510_configure_endpoints
- *
- * This function implements TRM Figure 14-10.
- */
-static void omap1510_configure_endpoints (struct usb_device_instance *device)
-{
- int ep;
- struct usb_bus_instance *bus;
- struct usb_endpoint_instance *endpoint;
- unsigned short ep_ptr;
- unsigned short ep_size;
- unsigned short ep_isoc;
- unsigned short ep_doublebuffer;
- int ep_addr;
- int packet_size;
- int buffer_size;
- int attributes;
-
- bus = device->bus;
-
- /* There is a dedicated 2048 byte buffer for USB packets that may be
- * arbitrarily partitioned among the endpoints on 8-byte boundaries.
- * The first 8 bytes are reserved for receiving setup packets on
- * endpoint 0.
- */
- ep_ptr = 8; /* reserve the first 8 bytes for the setup fifo */
-
- for (ep = 0; ep < bus->max_endpoints; ep++) {
- endpoint = bus->endpoint_array + ep;
- ep_addr = endpoint->endpoint_address;
- if ((ep_addr & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) {
- /* IN endpoint */
- packet_size = endpoint->tx_packetSize;
- attributes = endpoint->tx_attributes;
- } else {
- /* OUT endpoint */
- packet_size = endpoint->rcv_packetSize;
- attributes = endpoint->rcv_attributes;
- }
-
- switch (packet_size) {
- case 0:
- ep_size = 0;
- break;
- case 8:
- ep_size = 0;
- break;
- case 16:
- ep_size = 1;
- break;
- case 32:
- ep_size = 2;
- break;
- case 64:
- ep_size = 3;
- break;
- case 128:
- ep_size = 4;
- break;
- case 256:
- ep_size = 5;
- break;
- case 512:
- ep_size = 6;
- break;
- default:
- UDCDBGA ("ep 0x%02x has bad packet size %d",
- ep_addr, packet_size);
- packet_size = 0;
- ep_size = 0;
- break;
- }
-
- switch (attributes & USB_ENDPOINT_XFERTYPE_MASK) {
- case USB_ENDPOINT_XFER_CONTROL:
- case USB_ENDPOINT_XFER_BULK:
- case USB_ENDPOINT_XFER_INT:
- default:
- /* A non-isochronous endpoint may optionally be
- * double-buffered. For now we disable
- * double-buffering.
- */
- ep_doublebuffer = 0;
- ep_isoc = 0;
- if (packet_size > 64)
- packet_size = 0;
- if (!ep || !ep_doublebuffer)
- buffer_size = packet_size;
- else
- buffer_size = packet_size * 2;
- break;
- case USB_ENDPOINT_XFER_ISOC:
- /* Isochronous endpoints are always double-
- * buffered, but the double-buffering bit
- * in the endpoint configuration register
- * becomes the msb of the endpoint size so we
- * set the double-buffering flag to zero.
- */
- ep_doublebuffer = 0;
- ep_isoc = 1;
- buffer_size = packet_size * 2;
- break;
- }
-
- /* check to see if our packet buffer RAM is exhausted */
- if ((ep_ptr + buffer_size) > 2048) {
- UDCDBGA ("out of packet RAM for ep 0x%02x buf size %d", ep_addr, buffer_size);
- buffer_size = packet_size = 0;
- }
-
- /* force a default configuration for endpoint 0 since it is
- * always enabled
- */
- if (!ep && ((packet_size < 8) || (packet_size > 64))) {
- buffer_size = packet_size = 64;
- ep_size = 3;
- }
-
- if (!ep) {
- /* configure endpoint 0 */
- outw ((ep_size << 12) | (ep_ptr >> 3), UDC_EP0);
- /*UDCDBGA("ep 0 buffer offset 0x%03x packet size 0x%03x", */
- /* ep_ptr, packet_size); */
- } else if ((ep_addr & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) {
- /* IN endpoint */
- if (packet_size) {
- outw ((1 << 15) | (ep_doublebuffer << 14) |
- (ep_size << 12) | (ep_isoc << 11) |
- (ep_ptr >> 3),
- UDC_EP_TX (ep_addr &
- USB_ENDPOINT_NUMBER_MASK));
- UDCDBGA ("IN ep %d buffer offset 0x%03x"
- " packet size 0x%03x",
- ep_addr & USB_ENDPOINT_NUMBER_MASK,
- ep_ptr, packet_size);
- } else {
- outw (0,
- UDC_EP_TX (ep_addr &
- USB_ENDPOINT_NUMBER_MASK));
- }
- } else {
- /* OUT endpoint */
- if (packet_size) {
- outw ((1 << 15) | (ep_doublebuffer << 14) |
- (ep_size << 12) | (ep_isoc << 11) |
- (ep_ptr >> 3),
- UDC_EP_RX (ep_addr &
- USB_ENDPOINT_NUMBER_MASK));
- UDCDBGA ("OUT ep %d buffer offset 0x%03x"
- " packet size 0x%03x",
- ep_addr & USB_ENDPOINT_NUMBER_MASK,
- ep_ptr, packet_size);
- } else {
- outw (0,
- UDC_EP_RX (ep_addr &
- USB_ENDPOINT_NUMBER_MASK));
- }
- }
- ep_ptr += buffer_size;
- }
-}
-
-/* omap1510_deconfigure_device
- *
- * This function balances omap1510_configure_device.
- */
-static void omap1510_deconfigure_device (void)
-{
- int epnum;
-
- UDCDBG ("clear Cfg_Lock");
- outw (inw (UDC_SYSCON1) & ~UDC_Cfg_Lock, UDC_SYSCON1);
- UDCREG (UDC_SYSCON1);
-
- /* deconfigure all endpoints */
- for (epnum = 1; epnum <= 15; epnum++) {
- outw (0, UDC_EP_RX (epnum));
- outw (0, UDC_EP_TX (epnum));
- }
-}
-
-/* omap1510_configure_device
- *
- * This function implements TRM Figure 14-9.
- */
-static void omap1510_configure_device (struct usb_device_instance *device)
-{
- omap1510_configure_endpoints (device);
-
-
- /* Figure 14-9 indicates we should enable interrupts here, but we have
- * other routines (udc_all_interrupts, udc_suspended_interrupts) to
- * do that.
- */
-
- UDCDBG ("set Cfg_Lock");
- outw (inw (UDC_SYSCON1) | UDC_Cfg_Lock, UDC_SYSCON1);
- UDCREG (UDC_SYSCON1);
-}
-
-/* omap1510_write_noniso_tx_fifo
- *
- * This function implements TRM Figure 14-30.
- *
- * If the endpoint has an active tx_urb, then the next packet of data from the
- * URB is written to the tx FIFO. The total amount of data in the urb is given
- * by urb->actual_length. The maximum amount of data that can be sent in any
- * one packet is given by endpoint->tx_packetSize. The number of data bytes
- * from this URB that have already been transmitted is given by endpoint->sent.
- * endpoint->last is updated by this routine with the number of data bytes
- * transmitted in this packet.
- *
- * In accordance with Figure 14-30, the EP_NUM register must already have been
- * written with the value to select the appropriate tx FIFO before this routine
- * is called.
- */
-static void omap1510_write_noniso_tx_fifo (struct usb_endpoint_instance
- *endpoint)
-{
- struct urb *urb = endpoint->tx_urb;
-
- if (urb) {
- unsigned int last, i;
-
- UDCDBGA ("urb->buffer %p, buffer_length %d, actual_length %d",
- urb->buffer, urb->buffer_length, urb->actual_length);
- if ((last =
- MIN (urb->actual_length - endpoint->sent,
- endpoint->tx_packetSize))) {
- u8 *cp = urb->buffer + endpoint->sent;
-
- UDCDBGA ("endpoint->sent %d, tx_packetSize %d, last %d", endpoint->sent, endpoint->tx_packetSize, last);
-
- if (((u32) cp & 1) == 0) { /* word aligned? */
- outsw (UDC_DATA, cp, last >> 1);
- } else { /* byte aligned. */
- for (i = 0; i < (last >> 1); i++) {
- u16 w = ((u16) cp[2 * i + 1] << 8) |
- (u16) cp[2 * i];
- outw (w, UDC_DATA);
- }
- }
- if (last & 1) {
- outb (*(cp + last - 1), UDC_DATA);
- }
- }
- endpoint->last = last;
- }
-}
-
-/* omap1510_read_noniso_rx_fifo
- *
- * This function implements TRM Figure 14-28.
- *
- * If the endpoint has an active rcv_urb, then the next packet of data is read
- * from the rcv FIFO and written to rcv_urb->buffer at offset
- * rcv_urb->actual_length to append the packet data to the data from any
- * previous packets for this transfer. We assume that there is sufficient room
- * left in the buffer to hold an entire packet of data.
- *
- * The return value is the number of bytes read from the FIFO for this packet.
- *
- * In accordance with Figure 14-28, the EP_NUM register must already have been
- * written with the value to select the appropriate rcv FIFO before this routine
- * is called.
- */
-static int omap1510_read_noniso_rx_fifo (struct usb_endpoint_instance
- *endpoint)
-{
- struct urb *urb = endpoint->rcv_urb;
- int len = 0;
-
- if (urb) {
- len = inw (UDC_RXFSTAT);
-
- if (len) {
- unsigned char *cp = urb->buffer + urb->actual_length;
-
- insw (UDC_DATA, cp, len >> 1);
- if (len & 1)
- *(cp + len - 1) = inb (UDC_DATA);
- }
- }
- return len;
-}
-
-/* omap1510_prepare_for_control_write_status
- *
- * This function implements TRM Figure 14-17.
- *
- * We have to deal here with non-autodecoded control writes that haven't already
- * been dealt with by ep0_recv_setup. The non-autodecoded standard control
- * write requests are: set/clear endpoint feature, set configuration, set
- * interface, and set descriptor. ep0_recv_setup handles set/clear requests for
- * ENDPOINT_HALT by halting the endpoint for a set request and resetting the
- * endpoint for a clear request. ep0_recv_setup returns an error for
- * SET_DESCRIPTOR requests which causes them to be terminated with a stall by
- * the setup handler. A SET_INTERFACE request is handled by ep0_recv_setup by
- * generating a DEVICE_SET_INTERFACE event. This leaves only the
- * SET_CONFIGURATION event for us to deal with here.
- *
- */
-static void omap1510_prepare_for_control_write_status (struct urb *urb)
-{
- struct usb_device_request *request = &urb->device_request;;
-
- /* check for a SET_CONFIGURATION request */
- if (request->bRequest == USB_REQ_SET_CONFIGURATION) {
- int configuration = le16_to_cpu (request->wValue) & 0xff;
- unsigned short devstat = inw (UDC_DEVSTAT);
-
- if ((devstat & (UDC_ADD | UDC_CFG)) == UDC_ADD) {
- /* device is currently in ADDRESSED state */
- if (configuration) {
- /* Assume the specified non-zero configuration
- * value is valid and switch to the CONFIGURED
- * state.
- */
- outw (UDC_Dev_Cfg, UDC_SYSCON2);
- }
- } else if ((devstat & UDC_CFG) == UDC_CFG) {
- /* device is currently in CONFIGURED state */
- if (!configuration) {
- /* Switch to ADDRESSED state. */
- outw (UDC_Clr_Cfg, UDC_SYSCON2);
- }
- }
- }
-
- /* select EP0 tx FIFO */
- outw (UDC_EP_Dir | UDC_EP_Sel, UDC_EP_NUM);
- /* clear endpoint (no data bytes in status stage) */
- outw (UDC_Clr_EP, UDC_CTRL);
- /* enable the EP0 tx FIFO */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- /* deselect the endpoint */
- outw (UDC_EP_Dir, UDC_EP_NUM);
-}
-
-/* udc_state_transition_up
- * udc_state_transition_down
- *
- * Helper functions to implement device state changes. The device states and
- * the events that transition between them are:
- *
- * STATE_ATTACHED
- * || /\
- * \/ ||
- * DEVICE_HUB_CONFIGURED DEVICE_HUB_RESET
- * || /\
- * \/ ||
- * STATE_POWERED
- * || /\
- * \/ ||
- * DEVICE_RESET DEVICE_POWER_INTERRUPTION
- * || /\
- * \/ ||
- * STATE_DEFAULT
- * || /\
- * \/ ||
- * DEVICE_ADDRESS_ASSIGNED DEVICE_RESET
- * || /\
- * \/ ||
- * STATE_ADDRESSED
- * || /\
- * \/ ||
- * DEVICE_CONFIGURED DEVICE_DE_CONFIGURED
- * || /\
- * \/ ||
- * STATE_CONFIGURED
- *
- * udc_state_transition_up transitions up (in the direction from STATE_ATTACHED
- * to STATE_CONFIGURED) from the specified initial state to the specified final
- * state, passing through each intermediate state on the way. If the initial
- * state is at or above (i.e. nearer to STATE_CONFIGURED) the final state, then
- * no state transitions will take place.
- *
- * udc_state_transition_down transitions down (in the direction from
- * STATE_CONFIGURED to STATE_ATTACHED) from the specified initial state to the
- * specified final state, passing through each intermediate state on the way.
- * If the initial state is at or below (i.e. nearer to STATE_ATTACHED) the final
- * state, then no state transitions will take place.
- *
- * These functions must only be called with interrupts disabled.
- */
-static void udc_state_transition_up (usb_device_state_t initial,
- usb_device_state_t final)
-{
- if (initial < final) {
- switch (initial) {
- case STATE_ATTACHED:
- usbd_device_event_irq (udc_device,
- DEVICE_HUB_CONFIGURED, 0);
- if (final == STATE_POWERED)
- break;
- case STATE_POWERED:
- usbd_device_event_irq (udc_device, DEVICE_RESET, 0);
- if (final == STATE_DEFAULT)
- break;
- case STATE_DEFAULT:
- usbd_device_event_irq (udc_device,
- DEVICE_ADDRESS_ASSIGNED, 0);
- if (final == STATE_ADDRESSED)
- break;
- case STATE_ADDRESSED:
- usbd_device_event_irq (udc_device, DEVICE_CONFIGURED,
- 0);
- case STATE_CONFIGURED:
- break;
- default:
- break;
- }
- }
-}
-
-static void udc_state_transition_down (usb_device_state_t initial,
- usb_device_state_t final)
-{
- if (initial > final) {
- switch (initial) {
- case STATE_CONFIGURED:
- usbd_device_event_irq (udc_device, DEVICE_DE_CONFIGURED, 0);
- if (final == STATE_ADDRESSED)
- break;
- case STATE_ADDRESSED:
- usbd_device_event_irq (udc_device, DEVICE_RESET, 0);
- if (final == STATE_DEFAULT)
- break;
- case STATE_DEFAULT:
- usbd_device_event_irq (udc_device, DEVICE_POWER_INTERRUPTION, 0);
- if (final == STATE_POWERED)
- break;
- case STATE_POWERED:
- usbd_device_event_irq (udc_device, DEVICE_HUB_RESET, 0);
- case STATE_ATTACHED:
- break;
- default:
- break;
- }
- }
-}
-
-/* Handle all device state changes.
- * This function implements TRM Figure 14-21.
- */
-static void omap1510_udc_state_changed (void)
-{
- u16 bits;
- u16 devstat = inw (UDC_DEVSTAT);
-
- UDCDBGA ("state changed, devstat %x, old %x", devstat, udc_devstat);
-
- bits = devstat ^ udc_devstat;
- if (bits) {
- if (bits & UDC_ATT) {
- if (devstat & UDC_ATT) {
- UDCDBG ("device attached and powered");
- udc_state_transition_up (udc_device->device_state, STATE_POWERED);
- } else {
- UDCDBG ("device detached or unpowered");
- udc_state_transition_down (udc_device->device_state, STATE_ATTACHED);
- }
- }
- if (bits & UDC_USB_Reset) {
- if (devstat & UDC_USB_Reset) {
- UDCDBG ("device reset in progess");
- udc_state_transition_down (udc_device->device_state, STATE_POWERED);
- } else {
- UDCDBG ("device reset completed");
- }
- }
- if (bits & UDC_DEF) {
- if (devstat & UDC_DEF) {
- UDCDBG ("device entering default state");
- udc_state_transition_up (udc_device->device_state, STATE_DEFAULT);
- } else {
- UDCDBG ("device leaving default state");
- udc_state_transition_down (udc_device->device_state, STATE_POWERED);
- }
- }
- if (bits & UDC_SUS) {
- if (devstat & UDC_SUS) {
- UDCDBG ("entering suspended state");
- usbd_device_event_irq (udc_device, DEVICE_BUS_INACTIVE, 0);
- } else {
- UDCDBG ("leaving suspended state");
- usbd_device_event_irq (udc_device, DEVICE_BUS_ACTIVITY, 0);
- }
- }
- if (bits & UDC_R_WK_OK) {
- UDCDBGA ("remote wakeup %s", (devstat & UDC_R_WK_OK)
- ? "enabled" : "disabled");
- }
- if (bits & UDC_ADD) {
- if (devstat & UDC_ADD) {
- UDCDBG ("default -> addressed");
- udc_state_transition_up (udc_device->device_state, STATE_ADDRESSED);
- } else {
- UDCDBG ("addressed -> default");
- udc_state_transition_down (udc_device->device_state, STATE_DEFAULT);
- }
- }
- if (bits & UDC_CFG) {
- if (devstat & UDC_CFG) {
- UDCDBG ("device configured");
- /* The ep0_recv_setup function generates the
- * DEVICE_CONFIGURED event when a
- * USB_REQ_SET_CONFIGURATION setup packet is
- * received, so we should already be in the
- * state STATE_CONFIGURED.
- */
- udc_state_transition_up (udc_device->device_state, STATE_CONFIGURED);
- } else {
- UDCDBG ("device deconfigured");
- udc_state_transition_down (udc_device->device_state, STATE_ADDRESSED);
- }
- }
- }
-
- /* Clear interrupt source */
- outw (UDC_DS_Chg, UDC_IRQ_SRC);
-
- /* Save current DEVSTAT */
- udc_devstat = devstat;
-}
-
-/* Handle SETUP USB interrupt.
- * This function implements TRM Figure 14-14.
- */
-static void omap1510_udc_setup (struct usb_endpoint_instance *endpoint)
-{
- UDCDBG ("-> Entering device setup");
-
- do {
- const int setup_pktsize = 8;
- unsigned char *datap =
- (unsigned char *) &ep0_urb->device_request;
-
- /* Gain access to EP 0 setup FIFO */
- outw (UDC_Setup_Sel, UDC_EP_NUM);
-
- /* Read control request data */
- insb (UDC_DATA, datap, setup_pktsize);
-
- UDCDBGA ("EP0 setup read [%x %x %x %x %x %x %x %x]",
- *(datap + 0), *(datap + 1), *(datap + 2),
- *(datap + 3), *(datap + 4), *(datap + 5),
- *(datap + 6), *(datap + 7));
-
- /* Reset EP0 setup FIFO */
- outw (0, UDC_EP_NUM);
- } while (inw (UDC_IRQ_SRC) & UDC_Setup);
-
- /* Try to process setup packet */
- if (ep0_recv_setup (ep0_urb)) {
- /* Not a setup packet, stall next EP0 transaction */
- udc_stall_ep (0);
- UDCDBG ("can't parse setup packet, still waiting for setup");
- return;
- }
-
- /* Check direction */
- if ((ep0_urb->device_request.bmRequestType & USB_REQ_DIRECTION_MASK)
- == USB_REQ_HOST2DEVICE) {
- UDCDBG ("control write on EP0");
- if (le16_to_cpu (ep0_urb->device_request.wLength)) {
- /* We don't support control write data stages.
- * The only standard control write request with a data
- * stage is SET_DESCRIPTOR, and ep0_recv_setup doesn't
- * support that so we just stall those requests. A
- * function driver might support a non-standard
- * write request with a data stage, but it isn't
- * obvious what we would do with the data if we read it
- * so we'll just stall it. It seems like the API isn't
- * quite right here.
- */
-#if 0
- /* Here is what we would do if we did support control
- * write data stages.
- */
- ep0_urb->actual_length = 0;
- outw (0, UDC_EP_NUM);
- /* enable the EP0 rx FIFO */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
-#else
- /* Stall this request */
- UDCDBG ("Stalling unsupported EP0 control write data "
- "stage.");
- udc_stall_ep (0);
-#endif
- } else {
- omap1510_prepare_for_control_write_status (ep0_urb);
- }
- } else {
- UDCDBG ("control read on EP0");
- /* The ep0_recv_setup function has already placed our response
- * packet data in ep0_urb->buffer and the packet length in
- * ep0_urb->actual_length.
- */
- endpoint->tx_urb = ep0_urb;
- endpoint->sent = 0;
- /* select the EP0 tx FIFO */
- outw (UDC_EP_Dir | UDC_EP_Sel, UDC_EP_NUM);
- /* Write packet data to the FIFO. omap1510_write_noniso_tx_fifo
- * will update endpoint->last with the number of bytes written
- * to the FIFO.
- */
- omap1510_write_noniso_tx_fifo (endpoint);
- /* enable the FIFO to start the packet transmission */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- /* deselect the EP0 tx FIFO */
- outw (UDC_EP_Dir, UDC_EP_NUM);
- }
-
- UDCDBG ("<- Leaving device setup");
-}
-
-/* Handle endpoint 0 RX interrupt
- * This routine implements TRM Figure 14-16.
- */
-static void omap1510_udc_ep0_rx (struct usb_endpoint_instance *endpoint)
-{
- unsigned short status;
-
- UDCDBG ("RX on EP0");
- /* select EP0 rx FIFO */
- outw (UDC_EP_Sel, UDC_EP_NUM);
-
- status = inw (UDC_STAT_FLG);
-
- if (status & UDC_ACK) {
- /* Check direction */
- if ((ep0_urb->device_request.bmRequestType
- & USB_REQ_DIRECTION_MASK) == USB_REQ_HOST2DEVICE) {
- /* This rx interrupt must be for a control write data
- * stage packet.
- *
- * We don't support control write data stages.
- * We should never end up here.
- */
-
- /* clear the EP0 rx FIFO */
- outw (UDC_Clr_EP, UDC_CTRL);
-
- /* deselect the EP0 rx FIFO */
- outw (0, UDC_EP_NUM);
-
- UDCDBG ("Stalling unexpected EP0 control write "
- "data stage packet");
- udc_stall_ep (0);
- } else {
- /* This rx interrupt must be for a control read status
- * stage packet.
- */
- UDCDBG ("ACK on EP0 control read status stage packet");
- /* deselect EP0 rx FIFO */
- outw (0, UDC_EP_NUM);
- }
- } else if (status & UDC_STALL) {
- UDCDBG ("EP0 stall during RX");
- /* deselect EP0 rx FIFO */
- outw (0, UDC_EP_NUM);
- } else {
- /* deselect EP0 rx FIFO */
- outw (0, UDC_EP_NUM);
- }
-}
-
-/* Handle endpoint 0 TX interrupt
- * This routine implements TRM Figure 14-18.
- */
-static void omap1510_udc_ep0_tx (struct usb_endpoint_instance *endpoint)
-{
- unsigned short status;
- struct usb_device_request *request = &ep0_urb->device_request;
-
- UDCDBG ("TX on EP0");
- /* select EP0 TX FIFO */
- outw (UDC_EP_Dir | UDC_EP_Sel, UDC_EP_NUM);
-
- status = inw (UDC_STAT_FLG);
- if (status & UDC_ACK) {
- /* Check direction */
- if ((request->bmRequestType & USB_REQ_DIRECTION_MASK) ==
- USB_REQ_HOST2DEVICE) {
- /* This tx interrupt must be for a control write status
- * stage packet.
- */
- UDCDBG ("ACK on EP0 control write status stage packet");
- /* deselect EP0 TX FIFO */
- outw (UDC_EP_Dir, UDC_EP_NUM);
- } else {
- /* This tx interrupt must be for a control read data
- * stage packet.
- */
- int wLength = le16_to_cpu (request->wLength);
-
- /* Update our count of bytes sent so far in this
- * transfer.
- */
- endpoint->sent += endpoint->last;
-
- /* We are finished with this transfer if we have sent
- * all of the bytes in our tx urb (urb->actual_length)
- * unless we need a zero-length terminating packet. We
- * need a zero-length terminating packet if we returned
- * fewer bytes than were requested (wLength) by the host,
- * and the number of bytes we returned is an exact
- * multiple of the packet size endpoint->tx_packetSize.
- */
- if ((endpoint->sent == ep0_urb->actual_length)
- && ((ep0_urb->actual_length == wLength)
- || (endpoint->last !=
- endpoint->tx_packetSize))) {
- /* Done with control read data stage. */
- UDCDBG ("control read data stage complete");
- /* deselect EP0 TX FIFO */
- outw (UDC_EP_Dir, UDC_EP_NUM);
- /* select EP0 RX FIFO to prepare for control
- * read status stage.
- */
- outw (UDC_EP_Sel, UDC_EP_NUM);
- /* clear the EP0 RX FIFO */
- outw (UDC_Clr_EP, UDC_CTRL);
- /* enable the EP0 RX FIFO */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- /* deselect the EP0 RX FIFO */
- outw (0, UDC_EP_NUM);
- } else {
- /* We still have another packet of data to send
- * in this control read data stage or else we
- * need a zero-length terminating packet.
- */
- UDCDBG ("ACK control read data stage packet");
- omap1510_write_noniso_tx_fifo (endpoint);
- /* enable the EP0 tx FIFO to start transmission */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- /* deselect EP0 TX FIFO */
- outw (UDC_EP_Dir, UDC_EP_NUM);
- }
- }
- } else if (status & UDC_STALL) {
- UDCDBG ("EP0 stall during TX");
- /* deselect EP0 TX FIFO */
- outw (UDC_EP_Dir, UDC_EP_NUM);
- } else {
- /* deselect EP0 TX FIFO */
- outw (UDC_EP_Dir, UDC_EP_NUM);
- }
-}
-
-/* Handle RX transaction on non-ISO endpoint.
- * This function implements TRM Figure 14-27.
- * The ep argument is a physical endpoint number for a non-ISO OUT endpoint
- * in the range 1 to 15.
- */
-static void omap1510_udc_epn_rx (int ep)
-{
- unsigned short status;
-
- /* Check endpoint status */
- status = inw (UDC_STAT_FLG);
-
- if (status & UDC_ACK) {
- int nbytes;
- struct usb_endpoint_instance *endpoint =
- omap1510_find_ep (ep);
-
- nbytes = omap1510_read_noniso_rx_fifo (endpoint);
- usbd_rcv_complete (endpoint, nbytes, 0);
-
- /* enable rx FIFO to prepare for next packet */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- } else if (status & UDC_STALL) {
- UDCDBGA ("STALL on RX endpoint %d", ep);
- } else if (status & UDC_NAK) {
- UDCDBGA ("NAK on RX ep %d", ep);
- } else {
- serial_printf ("omap-bi: RX on ep %d with status %x", ep,
- status);
- }
-}
-
-/* Handle TX transaction on non-ISO endpoint.
- * This function implements TRM Figure 14-29.
- * The ep argument is a physical endpoint number for a non-ISO IN endpoint
- * in the range 16 to 30.
- */
-static void omap1510_udc_epn_tx (int ep)
-{
- unsigned short status;
-
- /*serial_printf("omap1510_udc_epn_tx( %x )\n",ep); */
-
- /* Check endpoint status */
- status = inw (UDC_STAT_FLG);
-
- if (status & UDC_ACK) {
- struct usb_endpoint_instance *endpoint =
- omap1510_find_ep (ep);
-
- /* We need to transmit a terminating zero-length packet now if
- * we have sent all of the data in this URB and the transfer
- * size was an exact multiple of the packet size.
- */
- if (endpoint->tx_urb
- && (endpoint->last == endpoint->tx_packetSize)
- && (endpoint->tx_urb->actual_length - endpoint->sent -
- endpoint->last == 0)) {
- /* Prepare to transmit a zero-length packet. */
- endpoint->sent += endpoint->last;
- /* write 0 bytes of data to FIFO */
- omap1510_write_noniso_tx_fifo (endpoint);
- /* enable tx FIFO to start transmission */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- } else if (endpoint->tx_urb
- && endpoint->tx_urb->actual_length) {
- /* retire the data that was just sent */
- usbd_tx_complete (endpoint);
- /* Check to see if we have more data ready to transmit
- * now.
- */
- if (endpoint->tx_urb
- && endpoint->tx_urb->actual_length) {
- /* write data to FIFO */
- omap1510_write_noniso_tx_fifo (endpoint);
- /* enable tx FIFO to start transmission */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- }
- }
- } else if (status & UDC_STALL) {
- UDCDBGA ("STALL on TX endpoint %d", ep);
- } else if (status & UDC_NAK) {
- UDCDBGA ("NAK on TX endpoint %d", ep);
- } else {
- /*serial_printf("omap-bi: TX on ep %d with status %x\n", ep, status); */
- }
-}
-
-
-/*
--------------------------------------------------------------------------------
-*/
-
-/* Handle general USB interrupts and dispatch according to type.
- * This function implements TRM Figure 14-13.
- */
-void omap1510_udc_irq (void)
-{
- u16 irq_src = inw (UDC_IRQ_SRC);
- int valid_irq = 0;
-
- if (!(irq_src & ~UDC_SOF_Flg)) /* ignore SOF interrupts ) */
- return;
-
- UDCDBGA ("< IRQ #%d start >- %x", udc_interrupts, irq_src);
- /*serial_printf("< IRQ #%d start >- %x\n", udc_interrupts, irq_src); */
-
- if (irq_src & UDC_DS_Chg) {
- /* Device status changed */
- omap1510_udc_state_changed ();
- valid_irq++;
- }
- if (irq_src & UDC_EP0_RX) {
- /* Endpoint 0 receive */
- outw (UDC_EP0_RX, UDC_IRQ_SRC); /* ack interrupt */
- omap1510_udc_ep0_rx (udc_device->bus->endpoint_array + 0);
- valid_irq++;
- }
- if (irq_src & UDC_EP0_TX) {
- /* Endpoint 0 transmit */
- outw (UDC_EP0_TX, UDC_IRQ_SRC); /* ack interrupt */
- omap1510_udc_ep0_tx (udc_device->bus->endpoint_array + 0);
- valid_irq++;
- }
- if (irq_src & UDC_Setup) {
- /* Device setup */
- omap1510_udc_setup (udc_device->bus->endpoint_array + 0);
- valid_irq++;
- }
- /*if (!valid_irq) */
- /* serial_printf("unknown interrupt, IRQ_SRC %.4x\n", irq_src); */
- UDCDBGA ("< IRQ #%d end >", udc_interrupts);
- udc_interrupts++;
-}
-
-/* This function implements TRM Figure 14-26. */
-void omap1510_udc_noniso_irq (void)
-{
- unsigned short epnum;
- unsigned short irq_src = inw (UDC_IRQ_SRC);
- int valid_irq = 0;
-
- if (!(irq_src & (UDC_EPn_RX | UDC_EPn_TX)))
- return;
-
- UDCDBGA ("non-ISO IRQ, IRQ_SRC %x", inw (UDC_IRQ_SRC));
-
- if (irq_src & UDC_EPn_RX) { /* Endpoint N OUT transaction */
- /* Determine the endpoint number for this interrupt */
- epnum = (inw (UDC_EPN_STAT) & 0x0f00) >> 8;
- UDCDBGA ("RX on ep %x", epnum);
-
- /* acknowledge interrupt */
- outw (UDC_EPn_RX, UDC_IRQ_SRC);
-
- if (epnum) {
- /* select the endpoint FIFO */
- outw (UDC_EP_Sel | epnum, UDC_EP_NUM);
-
- omap1510_udc_epn_rx (epnum);
-
- /* deselect the endpoint FIFO */
- outw (epnum, UDC_EP_NUM);
- }
- valid_irq++;
- }
- if (irq_src & UDC_EPn_TX) { /* Endpoint N IN transaction */
- /* Determine the endpoint number for this interrupt */
- epnum = (inw (UDC_EPN_STAT) & 0x000f) | USB_DIR_IN;
- UDCDBGA ("TX on ep %x", epnum);
-
- /* acknowledge interrupt */
- outw (UDC_EPn_TX, UDC_IRQ_SRC);
-
- if (epnum) {
- /* select the endpoint FIFO */
- outw (UDC_EP_Sel | UDC_EP_Dir | epnum, UDC_EP_NUM);
-
- omap1510_udc_epn_tx (epnum);
-
- /* deselect the endpoint FIFO */
- outw (UDC_EP_Dir | epnum, UDC_EP_NUM);
- }
- valid_irq++;
- }
- if (!valid_irq)
- serial_printf (": unknown non-ISO interrupt, IRQ_SRC %.4x\n",
- irq_src);
-}
-
-/*
--------------------------------------------------------------------------------
-*/
-
-
-/*
- * Start of public functions.
- */
-
-/* Called to start packet transmission. */
-int udc_endpoint_write (struct usb_endpoint_instance *endpoint)
-{
- unsigned short epnum =
- endpoint->endpoint_address & USB_ENDPOINT_NUMBER_MASK;
-
- UDCDBGA ("Starting transmit on ep %x", epnum);
-
- if (endpoint->tx_urb) {
- /* select the endpoint FIFO */
- outw (UDC_EP_Sel | UDC_EP_Dir | epnum, UDC_EP_NUM);
- /* write data to FIFO */
- omap1510_write_noniso_tx_fifo (endpoint);
- /* enable tx FIFO to start transmission */
- outw (UDC_Set_FIFO_En, UDC_CTRL);
- /* deselect the endpoint FIFO */
- outw (UDC_EP_Dir | epnum, UDC_EP_NUM);
- }
-
- return 0;
-}
-
-/* Start to initialize h/w stuff */
-int udc_init (void)
-{
- u16 udc_rev;
- uchar value;
- ulong gpio;
- int i;
-
- /* Let the device settle down before we start */
- for (i = 0; i < UDC_INIT_MDELAY; i++) udelay(1000);
-
- udc_device = NULL;
-
- UDCDBG ("starting");
-
- /* Check peripheral reset. Must be 1 to make sure
- MPU TIPB peripheral reset is inactive */
- UDCREG (ARM_RSTCT2);
-
- /* Set and check clock control.
- * We might ought to be using the clock control API to do
- * this instead of fiddling with the clock registers directly
- * here.
- */
- outw ((1 << 4) | (1 << 5), CLOCK_CTRL);
- UDCREG (CLOCK_CTRL);
-
- /* Set and check SOFT
- * The below line of code has been changed to perform a
- * read-modify-write instead of a simple write for
- * configuring the SOFT_REQ register. This allows the code
- * to be compatible with OMAP5912 and OMAP16xx devices
- */
- outw ((1 << 4) | (1 << 3) | 1 | (inw(SOFT_REQ)), SOFT_REQ);
-
- /* Short delay to wait for DPLL */
- udelay (1000);
-
- /* Print banner with device revision */
- udc_rev = inw (UDC_REV) & 0xff;
-
-#ifdef CONFIG_OMAP1610
- printf ("USB: TI OMAP5912 USB function module rev %d.%d\n",
- udc_rev >> 4, udc_rev & 0xf);
-#endif
-
- /* The VBUS_MODE bit selects whether VBUS detection is done via
- * software (1) or hardware (0). When software detection is
- * selected, VBUS_CTRL selects whether USB is not connected (0)
- * or connected (1).
- */
- outl (inl (FUNC_MUX_CTRL_0) | UDC_VBUS_MODE, FUNC_MUX_CTRL_0);
- outl (inl (FUNC_MUX_CTRL_0) & ~UDC_VBUS_CTRL, FUNC_MUX_CTRL_0);
- UDCREGL (FUNC_MUX_CTRL_0);
-
- /*
- * At this point, device is ready for configuration...
- */
-
- UDCDBG ("disable USB interrupts");
- outw (0, UDC_IRQ_EN);
- UDCREG (UDC_IRQ_EN);
-
- UDCDBG ("disable USB DMA");
- outw (0, UDC_DMA_IRQ_EN);
- UDCREG (UDC_DMA_IRQ_EN);
-
- UDCDBG ("initialize SYSCON1");
- outw (UDC_Self_Pwr | UDC_Pullup_En, UDC_SYSCON1);
- UDCREG (UDC_SYSCON1);
-
- return 0;
-}
-
-/* Stall endpoint */
-static void udc_stall_ep (unsigned int ep_addr)
-{
- /*int ep_addr = PHYS_EP_TO_EP_ADDR(ep); */
- int ep_num = ep_addr & USB_ENDPOINT_NUMBER_MASK;
-
- UDCDBGA ("stall ep_addr %d", ep_addr);
-
- /* REVISIT?
- * The OMAP TRM section 14.2.4.2 says we must check that the FIFO
- * is empty before halting the endpoint. The current implementation
- * doesn't check that the FIFO is empty.
- */
-
- if (!ep_num) {
- outw (UDC_Stall_Cmd, UDC_SYSCON2);
- } else if ((ep_addr & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
- if (inw (UDC_EP_RX (ep_num)) & UDC_EPn_RX_Valid) {
- /* we have a valid rx endpoint, so halt it */
- outw (UDC_EP_Sel | ep_num, UDC_EP_NUM);
- outw (UDC_Set_Halt, UDC_CTRL);
- outw (ep_num, UDC_EP_NUM);
- }
- } else {
- if (inw (UDC_EP_TX (ep_num)) & UDC_EPn_TX_Valid) {
- /* we have a valid tx endpoint, so halt it */
- outw (UDC_EP_Sel | UDC_EP_Dir | ep_num, UDC_EP_NUM);
- outw (UDC_Set_Halt, UDC_CTRL);
- outw (ep_num, UDC_EP_NUM);
- }
- }
-}
-
-/* Reset endpoint */
-#if 0
-static void udc_reset_ep (unsigned int ep_addr)
-{
- /*int ep_addr = PHYS_EP_TO_EP_ADDR(ep); */
- int ep_num = ep_addr & USB_ENDPOINT_NUMBER_MASK;
-
- UDCDBGA ("reset ep_addr %d", ep_addr);
-
- if (!ep_num) {
- /* control endpoint 0 can't be reset */
- } else if ((ep_addr & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) {
- UDCDBGA ("UDC_EP_RX(%d) = 0x%04x", ep_num,
- inw (UDC_EP_RX (ep_num)));
- if (inw (UDC_EP_RX (ep_num)) & UDC_EPn_RX_Valid) {
- /* we have a valid rx endpoint, so reset it */
- outw (ep_num | UDC_EP_Sel, UDC_EP_NUM);
- outw (UDC_Reset_EP, UDC_CTRL);
- outw (ep_num, UDC_EP_NUM);
- UDCDBGA ("OUT endpoint %d reset", ep_num);
- }
- } else {
- UDCDBGA ("UDC_EP_TX(%d) = 0x%04x", ep_num,
- inw (UDC_EP_TX (ep_num)));
- /* Resetting of tx endpoints seems to be causing the USB function
- * module to fail, which causes problems when the driver is
- * uninstalled. We'll skip resetting tx endpoints for now until
- * we figure out what the problem is.
- */
-#if 0
- if (inw (UDC_EP_TX (ep_num)) & UDC_EPn_TX_Valid) {
- /* we have a valid tx endpoint, so reset it */
- outw (ep_num | UDC_EP_Dir | UDC_EP_Sel, UDC_EP_NUM);
- outw (UDC_Reset_EP, UDC_CTRL);
- outw (ep_num | UDC_EP_Dir, UDC_EP_NUM);
- UDCDBGA ("IN endpoint %d reset", ep_num);
- }
-#endif
- }
-}
-#endif
-
-/* ************************************************************************** */
-
-/**
- * udc_check_ep - check logical endpoint
- *
- * Return physical endpoint number to use for this logical endpoint or zero if not valid.
- */
-#if 0
-int udc_check_ep (int logical_endpoint, int packetsize)
-{
- if ((logical_endpoint == 0x80) ||
- ((logical_endpoint & 0x8f) != logical_endpoint)) {
- return 0;
- }
-
- switch (packetsize) {
- case 8:
- case 16:
- case 32:
- case 64:
- case 128:
- case 256:
- case 512:
- break;
- default:
- return 0;
- }
-
- return EP_ADDR_TO_PHYS_EP (logical_endpoint);
-}
-#endif
-
-/*
- * udc_setup_ep - setup endpoint
- *
- * Associate a physical endpoint with endpoint_instance
- */
-void udc_setup_ep (struct usb_device_instance *device,
- unsigned int ep, struct usb_endpoint_instance *endpoint)
-{
- UDCDBGA ("setting up endpoint addr %x", endpoint->endpoint_address);
-
- /* This routine gets called by bi_modinit for endpoint 0 and from
- * bi_config for all of the other endpoints. bi_config gets called
- * during the DEVICE_CREATE, DEVICE_CONFIGURED, and
- * DEVICE_SET_INTERFACE events. We need to reconfigure the OMAP packet
- * RAM after bi_config scans the selected device configuration and
- * initializes the endpoint structures, but before this routine enables
- * the OUT endpoint FIFOs. Since bi_config calls this routine in a
- * loop for endpoints 1 through UDC_MAX_ENDPOINTS, we reconfigure our
- * packet RAM here when ep==1.
- * I really hate to do this here, but it seems like the API exported
- * by the USB bus interface controller driver to the usbd-bi module
- * isn't quite right so there is no good place to do this.
- */
- if (ep == 1) {
- omap1510_deconfigure_device ();
- omap1510_configure_device (device);
- }
-
- if (endpoint && (ep < UDC_MAX_ENDPOINTS)) {
- int ep_addr = endpoint->endpoint_address;
-
- if (!ep_addr) {
- /* nothing to do for endpoint 0 */
- } else if ((ep_addr & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) {
- /* nothing to do for IN (tx) endpoints */
- } else { /* OUT (rx) endpoint */
- if (endpoint->rcv_packetSize) {
- /*struct urb* urb = &(urb_out_array[ep&0xFF]); */
- /*urb->endpoint = endpoint; */
- /*urb->device = device; */
- /*urb->buffer_length = sizeof(urb->buffer); */
-
- /*endpoint->rcv_urb = urb; */
- omap1510_prepare_endpoint_for_rx (ep_addr);
- }
- }
- }
-}
-
-/**
- * udc_disable_ep - disable endpoint
- * @ep:
- *
- * Disable specified endpoint
- */
-#if 0
-void udc_disable_ep (unsigned int ep_addr)
-{
- /*int ep_addr = PHYS_EP_TO_EP_ADDR(ep); */
- int ep_num = ep_addr & USB_ENDPOINT_NUMBER_MASK;
- struct usb_endpoint_instance *endpoint = omap1510_find_ep (ep_addr); /*udc_device->bus->endpoint_array + ep; */
-
- UDCDBGA ("disable ep_addr %d", ep_addr);
-
- if (!ep_num) {
- /* nothing to do for endpoint 0 */ ;
- } else if ((ep_addr & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) {
- if (endpoint->tx_packetSize) {
- /* we have a valid tx endpoint */
- /*usbd_flush_tx(endpoint); */
- endpoint->tx_urb = NULL;
- }
- } else {
- if (endpoint->rcv_packetSize) {
- /* we have a valid rx endpoint */
- /*usbd_flush_rcv(endpoint); */
- endpoint->rcv_urb = NULL;
- }
- }
-}
-#endif
-
-/* ************************************************************************** */
-
-/**
- * udc_connected - is the USB cable connected
- *
- * Return non-zero if cable is connected.
- */
-#if 0
-int udc_connected (void)
-{
- return ((inw (UDC_DEVSTAT) & UDC_ATT) == UDC_ATT);
-}
-#endif
-
-/* Turn on the USB connection by enabling the pullup resistor */
-void udc_connect (void)
-{
- UDCDBG ("connect, enable Pullup");
- outl (0x00000018, FUNC_MUX_CTRL_D);
-}
-
-/* Turn off the USB connection by disabling the pullup resistor */
-void udc_disconnect (void)
-{
- UDCDBG ("disconnect, disable Pullup");
- outl (0x00000000, FUNC_MUX_CTRL_D);
-}
-
-/* ************************************************************************** */
-
-
-/*
- * udc_disable_interrupts - disable interrupts
- * switch off interrupts
- */
-#if 0
-void udc_disable_interrupts (struct usb_device_instance *device)
-{
- UDCDBG ("disabling all interrupts");
- outw (0, UDC_IRQ_EN);
-}
-#endif
-
-/* ************************************************************************** */
-
-/**
- * udc_ep0_packetsize - return ep0 packetsize
- */
-#if 0
-int udc_ep0_packetsize (void)
-{
- return EP0_PACKETSIZE;
-}
-#endif
-
-/* Switch on the UDC */
-void udc_enable (struct usb_device_instance *device)
-{
- UDCDBGA ("enable device %p, status %d", device, device->status);
-
- /* initialize driver state variables */
- udc_devstat = 0;
-
- /* Save the device structure pointer */
- udc_device = device;
-
- /* Setup ep0 urb */
- if (!ep0_urb) {
- ep0_urb =
- usbd_alloc_urb (udc_device,
- udc_device->bus->endpoint_array);
- } else {
- serial_printf ("udc_enable: ep0_urb already allocated %p\n",
- ep0_urb);
- }
-
- UDCDBG ("Check clock status");
- UDCREG (STATUS_REQ);
-
- /* The VBUS_MODE bit selects whether VBUS detection is done via
- * software (1) or hardware (0). When software detection is
- * selected, VBUS_CTRL selects whether USB is not connected (0)
- * or connected (1).
- */
- outl (inl (FUNC_MUX_CTRL_0) | UDC_VBUS_CTRL | UDC_VBUS_MODE,
- FUNC_MUX_CTRL_0);
- UDCREGL (FUNC_MUX_CTRL_0);
-
- omap1510_configure_device (device);
-}
-
-/* Switch off the UDC */
-void udc_disable (void)
-{
- UDCDBG ("disable UDC");
-
- omap1510_deconfigure_device ();
-
- /* The VBUS_MODE bit selects whether VBUS detection is done via
- * software (1) or hardware (0). When software detection is
- * selected, VBUS_CTRL selects whether USB is not connected (0)
- * or connected (1).
- */
- outl (inl (FUNC_MUX_CTRL_0) | UDC_VBUS_MODE, FUNC_MUX_CTRL_0);
- outl (inl (FUNC_MUX_CTRL_0) & ~UDC_VBUS_CTRL, FUNC_MUX_CTRL_0);
- UDCREGL (FUNC_MUX_CTRL_0);
-
- /* Free ep0 URB */
- if (ep0_urb) {
- /*usbd_dealloc_urb(ep0_urb); */
- ep0_urb = NULL;
- }
-
- /* Reset device pointer.
- * We ought to do this here to balance the initialization of udc_device
- * in udc_enable, but some of our other exported functions get called
- * by the bus interface driver after udc_disable, so we have to hang on
- * to the device pointer to avoid a null pointer dereference. */
- /* udc_device = NULL; */
-}
-
-/**
- * udc_startup - allow udc code to do any additional startup
- */
-void udc_startup_events (struct usb_device_instance *device)
-{
- /* The DEVICE_INIT event puts the USB device in the state STATE_INIT. */
- usbd_device_event_irq (device, DEVICE_INIT, 0);
-
- /* The DEVICE_CREATE event puts the USB device in the state
- * STATE_ATTACHED.
- */
- usbd_device_event_irq (device, DEVICE_CREATE, 0);
-
- /* Some USB controller driver implementations signal
- * DEVICE_HUB_CONFIGURED and DEVICE_RESET events here.
- * DEVICE_HUB_CONFIGURED causes a transition to the state STATE_POWERED,
- * and DEVICE_RESET causes a transition to the state STATE_DEFAULT.
- * The OMAP USB client controller has the capability to detect when the
- * USB cable is connected to a powered USB bus via the ATT bit in the
- * DEVSTAT register, so we will defer the DEVICE_HUB_CONFIGURED and
- * DEVICE_RESET events until later.
- */
-
- udc_enable (device);
-}
-
-/**
- * udc_irq - do pseudo interrupts
- */
-void udc_irq(void)
-{
- /* Loop while we have interrupts.
- * If we don't do this, the input chain
- * polling delay is likely to miss
- * host requests.
- */
- while (inw (UDC_IRQ_SRC) & ~UDC_SOF_Flg) {
- /* Handle any new IRQs */
- omap1510_udc_irq ();
- omap1510_udc_noniso_irq ();
- }
-}
-
-/* Flow control */
-void udc_set_nak(int epid)
-{
- /* TODO: implement this functionality in omap1510 */
-}
-
-void udc_unset_nak (int epid)
-{
- /* TODO: implement this functionality in omap1510 */
-}
diff --git a/include/configs/omap1510.h b/include/configs/omap1510.h
deleted file mode 100644
index 5482722..0000000
--- a/include/configs/omap1510.h
+++ /dev/null
@@ -1,756 +0,0 @@
-/*
- *
- * BRIEF MODULE DESCRIPTION
- * OMAP hardware map
- *
- * Copyright (C) 2001 RidgeRun, Inc. (http://www.ridgerun.com)
- * Author: RidgeRun, Inc.
- * Greg Lonnon (glonnon at ridgerun.com) or info at ridgerun.com
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <linux/sizes.h>
-
-/*
- There are 2 sets of general I/O -->
- 1. GPIO (shared between ARM & DSP, configured by ARM)
- 2. MPUIO which can be used only by the ARM.
-
- Base address FFFB:5000 is where the ARM accesses the MPUIO control registers
- (see 7.2.2 of the TRM for MPUIO reg definitions).
-
- Base address E101:5000 is reserved for ARM access of the same MPUIO control
- regs, but via the DSP I/O map. This address is unavailable on 1510.
-
- Base address FFFC:E000 is where the ARM accesses the GPIO config registers
- directly via its own peripheral bus.
-
- Base address E101:E000 is where the ARM can access the same GPIO config
- registers, but the access takes place through the ARM port interface (called
- API or MPUI) via the DSP's peripheral bus (DSP I/O space).
-
- Therefore, the ARM should setup the GPIO regs thru the FFFC:E000 addresses
- instead of the E101:E000 addresses. The DSP has only read access of the pin
- control register, so this may explain the inability to write to E101:E018.
- Try accessing pin control reg at FFFC:E018.
- */
-#define OMAP1510_GPIO_BASE 0xfffce000
-#define OMAP1510_GPIO_START OMAP1510_GPIO_BASE
-#define OMAP1510_GPIO_SIZE SZ_4K
-
-#define OMAP1510_MCBSP1_BASE 0xE1011000
-#define OMAP1510_MCBSP1_SIZE SZ_4K
-#define OMAP1510_MCBSP1_START 0xE1011000
-
-#define OMAP1510_MCBSP2_BASE 0xFFFB1000
-
-#define OMAP1510_MCBSP3_BASE 0xE1017000
-#define OMAP1510_MCBSP3_SIZE SZ_4K
-#define OMAP1510_MCBSP3_START 0xE1017000
-
-/*
- * Where's the flush address (for flushing D and I cache?)
- */
-#define FLUSH_BASE 0xdf000000
-#define FLUSH_BASE_PHYS 0x00000000
-
-#ifndef __ASSEMBLER__
-
-#define PCIO_BASE 0
-
-/*
- * RAM definitions
- */
-#define MAPTOPHYS(a) ((unsigned long)(a) - PAGE_OFFSET)
-#define KERNTOPHYS(a) ((unsigned long)(&a))
-#define KERNEL_BASE (0x10008000)
-#endif
-
-/* macro to get at IO space when running virtually */
-#define IO_ADDRESS(x) ((x))
-
-/* ----------------------------------------------------------------------------
- * OMAP1510 system registers
- * ----------------------------------------------------------------------------
- */
-
-#define OMAP1510_UART1_BASE 0xfffb0000 /* "BLUETOOTH-UART" */
-#define OMAP1510_UART2_BASE 0xfffb0800 /* "MODEM-UART" */
-#define OMAP1510_RTC_BASE 0xfffb4800 /* RTC */
-#define OMAP1510_UART3_BASE 0xfffb9800 /* Shared MPU/DSP UART */
-#define OMAP1510_COM_MCBSP2_BASE 0xffff1000 /* Com McBSP2 */
-#define OMAP1510_AUDIO_MCBSP_BASE 0xffff1800 /* Audio McBSP2 */
-#define OMAP1510_ARMIO_BASE 0xfffb5000 /* keyboard/gpio */
-
-/*
- * OMAP1510 UART3 Registers
- */
-
-#define OMAP_MPU_UART3_BASE 0xFFFB9800 /* UART3 through MPU bus */
-
-/* UART3 Registers Maping through MPU bus */
-
-#define UART3_RHR (OMAP_MPU_UART3_BASE + 0)
-#define UART3_THR (OMAP_MPU_UART3_BASE + 0)
-#define UART3_DLL (OMAP_MPU_UART3_BASE + 0)
-#define UART3_IER (OMAP_MPU_UART3_BASE + 4)
-#define UART3_DLH (OMAP_MPU_UART3_BASE + 4)
-#define UART3_IIR (OMAP_MPU_UART3_BASE + 8)
-#define UART3_FCR (OMAP_MPU_UART3_BASE + 8)
-#define UART3_EFR (OMAP_MPU_UART3_BASE + 8)
-#define UART3_LCR (OMAP_MPU_UART3_BASE + 0x0C)
-#define UART3_MCR (OMAP_MPU_UART3_BASE + 0x10)
-#define UART3_XON1_ADDR1 (OMAP_MPU_UART3_BASE + 0x10)
-#define UART3_XON2_ADDR2 (OMAP_MPU_UART3_BASE + 0x14)
-#define UART3_LSR (OMAP_MPU_UART3_BASE + 0x14)
-#define UART3_TCR (OMAP_MPU_UART3_BASE + 0x18)
-#define UART3_MSR (OMAP_MPU_UART3_BASE + 0x18)
-#define UART3_XOFF1 (OMAP_MPU_UART3_BASE + 0x18)
-#define UART3_XOFF2 (OMAP_MPU_UART3_BASE + 0x1C)
-#define UART3_SPR (OMAP_MPU_UART3_BASE + 0x1C)
-#define UART3_TLR (OMAP_MPU_UART3_BASE + 0x1C)
-#define UART3_MDR1 (OMAP_MPU_UART3_BASE + 0x20)
-#define UART3_MDR2 (OMAP_MPU_UART3_BASE + 0x24)
-#define UART3_SFLSR (OMAP_MPU_UART3_BASE + 0x28)
-#define UART3_TXFLL (OMAP_MPU_UART3_BASE + 0x28)
-#define UART3_RESUME (OMAP_MPU_UART3_BASE + 0x2C)
-#define UART3_TXFLH (OMAP_MPU_UART3_BASE + 0x2C)
-#define UART3_SFREGL (OMAP_MPU_UART3_BASE + 0x30)
-#define UART3_RXFLL (OMAP_MPU_UART3_BASE + 0x30)
-#define UART3_SFREGH (OMAP_MPU_UART3_BASE + 0x34)
-#define UART3_RXFLH (OMAP_MPU_UART3_BASE + 0x34)
-#define UART3_BLR (OMAP_MPU_UART3_BASE + 0x38)
-#define UART3_ACREG (OMAP_MPU_UART3_BASE + 0x3C)
-#define UART3_DIV16 (OMAP_MPU_UART3_BASE + 0x3C)
-#define UART3_SCR (OMAP_MPU_UART3_BASE + 0x40)
-#define UART3_SSR (OMAP_MPU_UART3_BASE + 0x44)
-#define UART3_EBLR (OMAP_MPU_UART3_BASE + 0x48)
-#define UART3_OSC_12M_SEL (OMAP_MPU_UART3_BASE + 0x4C)
-#define UART3_MVR (OMAP_MPU_UART3_BASE + 0x50)
-
-/*
- * Configuration Registers
- */
-#define FUNC_MUX_CTRL_0 0xfffe1000
-#define FUNC_MUX_CTRL_1 0xfffe1004
-#define FUNC_MUX_CTRL_2 0xfffe1008
-#define COMP_MODE_CTRL_0 0xfffe100c
-#define FUNC_MUX_CTRL_3 0xfffe1010
-#define FUNC_MUX_CTRL_4 0xfffe1014
-#define FUNC_MUX_CTRL_5 0xfffe1018
-#define FUNC_MUX_CTRL_6 0xfffe101C
-#define FUNC_MUX_CTRL_7 0xfffe1020
-#define FUNC_MUX_CTRL_8 0xfffe1024
-#define FUNC_MUX_CTRL_9 0xfffe1028
-#define FUNC_MUX_CTRL_A 0xfffe102C
-#define FUNC_MUX_CTRL_B 0xfffe1030
-#define FUNC_MUX_CTRL_C 0xfffe1034
-#define FUNC_MUX_CTRL_D 0xfffe1038
-#define PULL_DWN_CTRL_0 0xfffe1040
-#define PULL_DWN_CTRL_1 0xfffe1044
-#define PULL_DWN_CTRL_2 0xfffe1048
-#define PULL_DWN_CTRL_3 0xfffe104c
-#define GATE_INH_CTRL_0 0xfffe1050
-#define VOLTAGE_CTRL_0 0xfffe1060
-#define TEST_DBG_CTRL_0 0xfffe1070
-
-#define MOD_CONF_CTRL_0 0xfffe1080
-
-#ifdef CONFIG_OMAP1610 /* 1610 Configuration Register */
-
-#define USB_OTG_CTRL 0xFFFB040C
-#define USB_TRANSCEIVER_CTRL 0xFFFE1064
-#define PULL_DWN_CTRL_4 0xFFFE10AC
-#define PU_PD_SEL_0 0xFFFE10B4
-#define PU_PD_SEL_1 0xFFFE10B8
-#define PU_PD_SEL_2 0xFFFE10BC
-#define PU_PD_SEL_3 0xFFFE10C0
-#define PU_PD_SEL_4 0xFFFE10C4
-
-#endif
-/*
- * Traffic Controller Memory Interface Registers
- */
-#define TCMIF_BASE 0xfffecc00
-#define IMIF_PRIO (TCMIF_BASE + 0x00)
-#define EMIFS_PRIO_REG (TCMIF_BASE + 0x04)
-#define EMIFF_PRIO_REG (TCMIF_BASE + 0x08)
-#define EMIFS_CONFIG_REG (TCMIF_BASE + 0x0c)
-#define EMIFS_CS0_CONFIG (TCMIF_BASE + 0x10)
-#define EMIFS_CS1_CONFIG (TCMIF_BASE + 0x14)
-#define EMIFS_CS2_CONFIG (TCMIF_BASE + 0x18)
-#define EMIFS_CS3_CONFIG (TCMIF_BASE + 0x1c)
-#define EMIFF_SDRAM_CONFIG (TCMIF_BASE + 0x20)
-#define EMIFF_MRS (TCMIF_BASE + 0x24)
-#define TC_TIMEOUT1 (TCMIF_BASE + 0x28)
-#define TC_TIMEOUT2 (TCMIF_BASE + 0x2c)
-#define TC_TIMEOUT3 (TCMIF_BASE + 0x30)
-#define TC_ENDIANISM (TCMIF_BASE + 0x34)
-#define EMIFF_SDRAM_CONFIG_2 (TCMIF_BASE + 0x3c)
-#define EMIF_CFG_DYNAMIC_WS (TCMIF_BASE + 0x40)
-
-/*
- * LCD Panel
- */
-#define TI925_LCD_BASE 0xFFFEC000
-#define TI925_LCD_CONTROL (TI925_LCD_BASE)
-#define TI925_LCD_TIMING0 (TI925_LCD_BASE+0x4)
-#define TI925_LCD_TIMING1 (TI925_LCD_BASE+0x8)
-#define TI925_LCD_TIMING2 (TI925_LCD_BASE+0xc)
-#define TI925_LCD_STATUS (TI925_LCD_BASE+0x10)
-#define TI925_LCD_SUBPANEL (TI925_LCD_BASE+0x14)
-
-#define OMAP_LCD_CONTROL TI925_LCD_CONTROL
-
-/* I2C Registers */
-
-#define I2C_BASE 0xfffb3800
-
-#define I2C_REV (I2C_BASE + 0x00)
-#define I2C_IE (I2C_BASE + 0x04)
-#define I2C_STAT (I2C_BASE + 0x08)
-#define I2C_IV (I2C_BASE + 0x0c)
-#define I2C_BUF (I2C_BASE + 0x14)
-#define I2C_CNT (I2C_BASE + 0x18)
-#define I2C_DATA (I2C_BASE + 0x1c)
-#define I2C_CON (I2C_BASE + 0x24)
-#define I2C_OA (I2C_BASE + 0x28)
-#define I2C_SA (I2C_BASE + 0x2c)
-#define I2C_PSC (I2C_BASE + 0x30)
-#define I2C_SCLL (I2C_BASE + 0x34)
-#define I2C_SCLH (I2C_BASE + 0x38)
-#define I2C_SYSTEST (I2C_BASE + 0x3c)
-
-/* I2C masks */
-
-/* I2C Interrupt Enable Register (I2C_IE): */
-
-#define I2C_IE_XRDY_IE (1 << 4) /* Transmit data ready interrupt enable */
-#define I2C_IE_RRDY_IE (1 << 3) /* Receive data ready interrupt enable */
-#define I2C_IE_ARDY_IE (1 << 2) /* Register access ready interrupt enable */
-#define I2C_IE_NACK_IE (1 << 1) /* No acknowledgment interrupt enable */
-#define I2C_IE_AL_IE (1 << 0) /* Arbitration lost interrupt enable */
-
-/* I2C Status Register (I2C_STAT): */
-
-#define I2C_STAT_SBD (1 << 15) /* Single byte data */
-#define I2C_STAT_BB (1 << 12) /* Bus busy */
-#define I2C_STAT_ROVR (1 << 11) /* Receive overrun */
-#define I2C_STAT_XUDF (1 << 10) /* Transmit underflow */
-#define I2C_STAT_AAS (1 << 9) /* Address as slave */
-#define I2C_STAT_AD0 (1 << 8) /* Address zero */
-#define I2C_STAT_XRDY (1 << 4) /* Transmit data ready */
-#define I2C_STAT_RRDY (1 << 3) /* Receive data ready */
-#define I2C_STAT_ARDY (1 << 2) /* Register access ready */
-#define I2C_STAT_NACK (1 << 1) /* No acknowledgment interrupt enable */
-#define I2C_STAT_AL (1 << 0) /* Arbitration lost interrupt enable */
-
-/* I2C Interrupt Vector Register (I2C_IV): */
-
-/* I2C Interrupt Code Register (I2C_INTCODE): */
-
-#define I2C_INTCODE_MASK 7
-#define I2C_INTCODE_NONE 0
-#define I2C_INTCODE_AL 1 /* Arbitration lost */
-#define I2C_INTCODE_NAK 2 /* No acknowledgement/general call */
-#define I2C_INTCODE_ARDY 3 /* Register access ready */
-#define I2C_INTCODE_RRDY 4 /* Rcv data ready */
-#define I2C_INTCODE_XRDY 5 /* Xmit data ready */
-
-/* I2C Buffer Configuration Register (I2C_BUF): */
-
-#define I2C_BUF_RDMA_EN (1 << 15) /* Receive DMA channel enable */
-#define I2C_BUF_XDMA_EN (1 << 7) /* Transmit DMA channel enable */
-
-/* I2C Configuration Register (I2C_CON): */
-
-#define I2C_CON_EN (1 << 15) /* I2C module enable */
-#define I2C_CON_BE (1 << 14) /* Big endian mode */
-#define I2C_CON_STB (1 << 11) /* Start byte mode (master mode only) */
-#define I2C_CON_MST (1 << 10) /* Master/slave mode */
-#define I2C_CON_TRX (1 << 9) /* Transmitter/receiver mode (master mode only) */
-#define I2C_CON_XA (1 << 8) /* Expand address */
-#define I2C_CON_RM (1 << 2) /* Repeat mode (master mode only) */
-#define I2C_CON_STP (1 << 1) /* Stop condition (master mode only) */
-#define I2C_CON_STT (1 << 0) /* Start condition (master mode only) */
-
-/* I2C System Test Register (I2C_SYSTEST): */
-
-#define I2C_SYSTEST_ST_EN (1 << 15) /* System test enable */
-#define I2C_SYSTEST_FREE (1 << 14) /* Free running mode (on breakpoint) */
-#define I2C_SYSTEST_TMODE_MASK (3 << 12) /* Test mode select */
-#define I2C_SYSTEST_TMODE_SHIFT (12) /* Test mode select */
-#define I2C_SYSTEST_SCL_I (1 << 3) /* SCL line sense input value */
-#define I2C_SYSTEST_SCL_O (1 << 2) /* SCL line drive output value */
-#define I2C_SYSTEST_SDA_I (1 << 1) /* SDA line sense input value */
-#define I2C_SYSTEST_SDA_O (1 << 0) /* SDA line drive output value */
-
-/*
- * MMC/SD Host Controller Registers
- */
-
-#define OMAP_MMC_CMD 0xFFFB7800 /* MMC Command */
-#define OMAP_MMC_ARGL 0xFFFB7804 /* MMC argument low */
-#define OMAP_MMC_ARGH 0xFFFB7808 /* MMC argument high */
-#define OMAP_MMC_CON 0xFFFB780C /* MMC system configuration */
-#define OMAP_MMC_STAT 0xFFFB7810 /* MMC status */
-#define OMAP_MMC_IE 0xFFFB7814 /* MMC system interrupt enable */
-#define OMAP_MMC_CTO 0xFFFB7818 /* MMC command time-out */
-#define OMAP_MMC_DTO 0xFFFB781C /* MMC data time-out */
-#define OMAP_MMC_DATA 0xFFFB7820 /* MMC TX/RX FIFO data */
-#define OMAP_MMC_BLEN 0xFFFB7824 /* MMC block length */
-#define OMAP_MMC_NBLK 0xFFFB7828 /* MMC number of blocks */
-#define OMAP_MMC_BUF 0xFFFB782C /* MMC buffer configuration */
-#define OMAP_MMC_SPI 0xFFFB7830 /* MMC serial port interface */
-#define OMAP_MMC_SDIO 0xFFFB7834 /* MMC SDIO mode configuration */
-#define OMAP_MMC_SYST 0xFFFB7838 /* MMC system test */
-#define OMAP_MMC_REV 0xFFFB783C /* MMC module version */
-#define OMAP_MMC_RSP0 0xFFFB7840 /* MMC command response 0 */
-#define OMAP_MMC_RSP1 0xFFFB7844 /* MMC command response 1 */
-#define OMAP_MMC_RSP2 0xFFFB7848 /* MMC command response 2 */
-#define OMAP_MMC_RSP3 0xFFFB784C /* MMC command response 3 */
-#define OMAP_MMC_RSP4 0xFFFB7850 /* MMC command response 4 */
-#define OMAP_MMC_RSP5 0xFFFB7854 /* MMC command response 5 */
-#define OMAP_MMC_RSP6 0xFFFB7858 /* MMC command response 6 */
-#define OMAP_MMC_RSP7 0xFFFB785C /* MMC command response 4 */
-
-/* MMC masks */
-
-#define OMAP_MMC_END_OF_CMD (1 << 0) /* End of command phase */
-#define OMAP_MMC_CARD_BUSY (1 << 2) /* Card enter busy state */
-#define OMAP_MMC_BLOCK_RS (1 << 3) /* Block received/sent */
-#define OMAP_MMC_EOF_BUSY (1 << 4) /* Card exit busy state */
-#define OMAP_MMC_DATA_TIMEOUT (1 << 5) /* Data response time-out */
-#define OMAP_MMC_DATA_CRC (1 << 6) /* Date CRC error */
-#define OMAP_MMC_CMD_TIMEOUT (1 << 7) /* Command response time-out */
-#define OMAP_MMC_CMD_CRC (1 << 8) /* Command CRC error */
-#define OMAP_MMC_A_FULL (1 << 10) /* Buffer almost full */
-#define OMAP_MMC_A_EMPTY (1 << 11) /* Buffer almost empty */
-#define OMAP_MMC_OCR_BUSY (1 << 12) /* OCR busy */
-#define OMAP_MMC_CARD_IRQ (1 << 13) /* Card IRQ received */
-#define OMAP_MMC_CARD_ERR (1 << 14) /* Card status error in response */
-
-/* 2.9.2 MPUI Interface Registers FFFE:C900 */
-
-#define MPUI_CTRL_REG (volatile __u32 *)(0xfffec900)
-#define MPUI_DEBUG_ADDR (volatile __u32 *)(0xfffec904)
-#define MPUI_DEBUG_DATA (volatile __u32 *)(0xfffec908)
-#define MPUI_DEBUG_FLAG (volatile __u16 *)(0xfffec90c)
-#define MPUI_STATUS_REG (volatile __u16 *)(0xfffec910)
-#define MPUI_DSP_STATUS_REG (volatile __u16 *)(0xfffec914)
-#define MPUI_DSP_BOOT_CONFIG (volatile __u16 *)(0xfffec918)
-#define MPUI_DSP_API_CONFIG (volatile __u16 *)(0xfffec91c)
-
-/* 2.9.6 Traffic Controller Memory Interface Registers: */
-#define OMAP_IMIF_PRIO_REG 0xfffecc00
-#define OMAP_EMIFS_PRIO_REG 0xfffecc04
-#define OMAP_EMIFF_PRIO_REG 0xfffecc08
-#define OMAP_EMIFS_CONFIG_REG 0xfffecc0c
-#define OMAP_EMIFS_CS0_CONFIG 0xfffecc10
-#define OMAP_EMIFS_CS1_CONFIG 0xfffecc14
-#define OMAP_EMIFS_CS2_CONFIG 0xfffecc18
-#define OMAP_EMIFS_CS3_CONFIG 0xfffecc1c
-#define OMAP_EMIFF_SDRAM_CONFIG 0xfffecc20
-#define OMAP_EMIFF_MRS 0xfffecc24
-#define OMAP_TIMEOUT1 0xfffecc28
-#define OMAP_TIMEOUT2 0xfffecc2c
-#define OMAP_TIMEOUT3 0xfffecc30
-#define OMAP_ENDIANISM 0xfffecc34
-
-/* 2.9.10 EMIF Slow Interface Configuration Register (EMIFS_CONFIG_REG): */
-#define OMAP_EMIFS_CONFIG_FR (1 << 4)
-#define OMAP_EMIFS_CONFIG_PDE (1 << 3)
-#define OMAP_EMIFS_CONFIG_PWD_EN (1 << 2)
-#define OMAP_EMIFS_CONFIG_BM (1 << 1)
-#define OMAP_EMIFS_CONFIG_WP (1 << 0)
-
-/*
- * Memory chunk set aside for the Framebuffer in SRAM
- */
-#define SRAM_FRAMEBUFFER_MEMORY OMAP1510_SRAM_BASE
-
-
-/*
- * DMA
- */
-
-#define OMAP1510_DMA_BASE 0xFFFED800
-#define OMAP_DMA_BASE OMAP1510_DMA_BASE
-
-/* Global Register selection */
-#define NO_GLOBAL_DMA_ACCESS 0
-
-/* Channel select field
- * NOTE: all other channels are linear, chan0 is 0, chan1 is 1, etc...
- */
-#define LCD_CHANNEL 0xc
-
-/* Register Select Field (LCD) */
-#define DMA_LCD_CTRL 0
-#define DMA_LCD_TOP_F1_L 1
-#define DMA_LCD_TOP_F1_U 2
-#define DMA_LCD_BOT_F1_L 3
-#define DMA_LCD_BOT_F1_U 4
-
-#define LCD_FRAME_MODE (1<<0)
-#define LCD_FRAME_IT_IE (1<<1)
-#define LCD_BUS_ERROR_IT_IE (1<<2)
-#define LCD_FRAME_1_IT_COND (1<<3)
-#define LCD_FRAME_2_IT_COND (1<<4)
-#define LCD_BUS_ERROR_IT_COND (1<<5)
-#define LCD_SOURCE_IMIF (1<<6)
-
-/*
- * Real-Time Clock
- */
-
-#define RTC_SECONDS (volatile __u8 *)(OMAP1510_RTC_BASE + 0x00)
-#define RTC_MINUTES (volatile __u8 *)(OMAP1510_RTC_BASE + 0x04)
-#define RTC_HOURS (volatile __u8 *)(OMAP1510_RTC_BASE + 0x08)
-#define RTC_DAYS (volatile __u8 *)(OMAP1510_RTC_BASE + 0x0C)
-#define RTC_MONTHS (volatile __u8 *)(OMAP1510_RTC_BASE + 0x10)
-#define RTC_YEARS (volatile __u8 *)(OMAP1510_RTC_BASE + 0x14)
-#define RTC_CTRL (volatile __u8 *)(OMAP1510_RTC_BASE + 0x40)
-
-
-/* ---------------------------------------------------------------------------
- * OMAP1510 Interrupt Handlers
- * ---------------------------------------------------------------------------
- *
- */
-#define OMAP_IH1_BASE 0xfffecb00
-#define OMAP_IH2_BASE 0xfffe0000
-#define OMAP1510_ITR 0x0
-#define OMAP1510_MASK 0x4
-
-#define INTERRUPT_HANDLER_BASE OMAP_IH1_BASE
-#define INTERRUPT_INPUT_REGISTER OMAP1510_ITR
-#define INTERRUPT_MASK_REGISTER OMAP1510_MASK
-
-
-/* ---------------------------------------------------------------------------
- * OMAP1510 TIMERS
- * ---------------------------------------------------------------------------
- *
- */
-
-#define OMAP1510_32kHz_TIMER_BASE 0xfffb9000
-
-/* 32k Timer Registers */
-#define TIMER32k_CR 0x08
-#define TIMER32k_TVR 0x00
-#define TIMER32k_TCR 0x04
-
-/* 32k Timer Control Register definition */
-#define TIMER32k_TSS (1<<0)
-#define TIMER32k_TRB (1<<1)
-#define TIMER32k_INT (1<<2)
-#define TIMER32k_ARL (1<<3)
-
-/* MPU Timer base addresses */
-#define OMAP1510_MPUTIMER_BASE 0xfffec500
-#define OMAP1510_MPUTIMER_OFF 0x00000100
-
-#define OMAP1510_TIMER1_BASE 0xfffec500
-#define OMAP1510_TIMER2_BASE 0xfffec600
-#define OMAP1510_TIMER3_BASE 0xfffec700
-
-/* MPU Timer Registers */
-#define CNTL_TIMER 0
-#define LOAD_TIM 4
-#define READ_TIM 8
-
-/* CNTL_TIMER register bits */
-#define MPUTIM_FREE (1<<6)
-#define MPUTIM_CLOCK_ENABLE (1<<5)
-#define MPUTIM_PTV_MASK (0x7<<MPUTIM_PTV_BIT)
-#define MPUTIM_PTV_BIT 2
-#define MPUTIM_AR (1<<1)
-#define MPUTIM_ST (1<<0)
-
-/* ---------------------------------------------------------------------------
- * OMAP1510 GPIO (SHARED)
- * ---------------------------------------------------------------------------
- *
- */
-#define GPIO_DATA_INPUT_REG (OMAP1510_GPIO_BASE + 0x0)
-#define GPIO_DATA_OUTPUT_REG (OMAP1510_GPIO_BASE + 0x4)
-#define GPIO_DIR_CONTROL_REG (OMAP1510_GPIO_BASE + 0x8)
-#define GPIO_INT_CONTROL_REG (OMAP1510_GPIO_BASE + 0xc)
-#define GPIO_INT_MASK_REG (OMAP1510_GPIO_BASE + 0x10)
-#define GPIO_INT_STATUS_REG (OMAP1510_GPIO_BASE + 0x14)
-#define GPIO_PIN_CONTROL_REG (OMAP1510_GPIO_BASE + 0x18)
-
-
-/* ---------------------------
- * OMAP1510 MPUIO (ARM only)
- *----------------------------
- */
-#define OMAP1510_MPUIO_BASE 0xFFFB5000
-#define MPUIO_DATA_INPUT_REG (OMAP1510_MPUIO_BASE + 0x0)
-#define MPUIO_DATA_OUTPUT_REG (OMAP1510_MPUIO_BASE + 0x4)
-#define MPUIO_DIR_CONTROL_REG (OMAP1510_MPUIO_BASE + 0x8)
-
-/* ---------------------------------------------------------------------------
- * OMAP1510 TIPB (only)
- * ---------------------------------------------------------------------------
- *
- */
-#define TIPB_PUBLIC_CNTL_BASE 0xfffed300
-#define MPU_PUBLIC_TIPB_CNTL_REG (TIPB_PUBLIC_CNTL_BASE + 0x8)
-#define TIPB_PRIVATE_CNTL_BASE 0xfffeca00
-#define MPU_PRIVATE_TIPB_CNTL_REG (TIPB_PRIVATE_CNTL_BASE + 0x8)
-
-/*
- * ---------------------------------------------------------------------------
- * OMAP1510 Camera Interface
- * ---------------------------------------------------------------------------
- */
-#define CAMERA_BASE (IO_BASE + 0x6800)
-#define CAM_CTRLCLOCK_REG (CAMERA_BASE + 0x00)
-#define CAM_IT_STATUS_REG (CAMERA_BASE + 0x04)
-#define CAM_MODE_REG (CAMERA_BASE + 0x08)
-#define CAM_STATUS_REG (CAMERA_BASE + 0x0C)
-#define CAM_CAMDATA_REG (CAMERA_BASE + 0x10)
-#define CAM_GPIO_REG (CAMERA_BASE + 0x14)
-#define CAM_PEAK_CTR_REG (CAMERA_BASE + 0x18)
-
-#if 0
-#ifndef __ASSEMBLY__
-typedef struct {
- __u32 ctrlclock;
- __u32 it_status;
- __u32 mode;
- __u32 status;
- __u32 camdata;
- __u32 gpio;
- __u32 peak_counter;
-} camera_regs_t;
-#endif
-#endif
-
-/* CTRLCLOCK bit shifts */
-#define FOSCMOD_BIT 0
-#define FOSCMOD_MASK (0x7 << FOSCMOD_BIT)
-#define FOSCMOD_12MHz 0x0
-#define FOSCMOD_6MHz 0x2
-#define FOSCMOD_9_6MHz 0x4
-#define FOSCMOD_24MHz 0x5
-#define FOSCMOD_8MHz 0x6
-#define POLCLK (1<<3)
-#define CAMEXCLK_EN (1<<4)
-#define MCLK_EN (1<<5)
-#define DPLL_EN (1<<6)
-#define LCLK_EN (1<<7)
-
-/* IT_STATUS bit shifts */
-#define V_UP (1<<0)
-#define V_DOWN (1<<1)
-#define H_UP (1<<2)
-#define H_DOWN (1<<3)
-#define FIFO_FULL (1<<4)
-#define DATA_XFER (1<<5)
-
-/* MODE bit shifts */
-#define CAMOSC (1<<0)
-#define IMGSIZE_BIT 1
-#define IMGSIZE_MASK (0x3 << IMGSIZE_BIT)
-#define IMGSIZE_CIF (0x0 << IMGSIZE_BIT) /* 352x288 */
-#define IMGSIZE_QCIF (0x1 << IMGSIZE_BIT) /* 176x144 */
-#define IMGSIZE_VGA (0x2 << IMGSIZE_BIT) /* 640x480 */
-#define IMGSIZE_QVGA (0x3 << IMGSIZE_BIT) /* 320x240 */
-#define ORDERCAMD (1<<3)
-#define EN_V_UP (1<<4)
-#define EN_V_DOWN (1<<5)
-#define EN_H_UP (1<<6)
-#define EN_H_DOWN (1<<7)
-#define EN_DMA (1<<8)
-#define THRESHOLD (1<<9)
-#define THRESHOLD_BIT 9
-#define THRESHOLD_MASK (0x7f<<9)
-#define EN_NIRQ (1<<16)
-#define EN_FIFO_FULL (1<<17)
-#define RAZ_FIFO (1<<18)
-
-/* STATUS bit shifts */
-#define VSTATUS (1<<0)
-#define HSTATUS (1<<1)
-
-/* GPIO bit shifts */
-#define CAM_RST (1<<0)
-
-
-/*********************
- * Watchdog timer.
- *********************/
-#define WDTIM_BASE 0xfffec800
-#define WDTIM_CONTROL (WDTIM_BASE+0x00)
-#define WDTIM_LOAD (WDTIM_BASE+0x04)
-#define WDTIM_READ (WDTIM_BASE+0x04)
-#define WDTIM_MODE (WDTIM_BASE+0x08)
-
-/* Values to write to mode register to disable the watchdog function. */
-#define DISABLE_SEQ1 0xF5
-#define DISABLE_SEQ2 0xA0
-
-/* WDTIM_CONTROL bit definitions. */
-#define WDTIM_CONTROL_ST BIT7
-
-
-/* ---------------------------------------------------------------------------
- * Differentiating processor versions for those who care.
- * ---------------------------------------------------------------------------
- *
- */
-#define OMAP1509 0
-#define OMAP1510 1
-
-#define OMAP1510_ID_CODE_REG 0xfffed404
-
-#ifndef __ASSEMBLY__
-int cpu_type(void);
-#endif
-
-/*****************************************************************************/
-
-#define CLKGEN_RESET_BASE (0xfffece00)
-#define ARM_CKCTL (volatile __u16 *)(CLKGEN_RESET_BASE + 0x0)
-#define ARM_IDLECT1 (volatile __u16 *)(CLKGEN_RESET_BASE + 0x4)
-#define ARM_IDLECT2 (volatile __u16 *)(CLKGEN_RESET_BASE + 0x8)
-#define ARM_EWUPCT (volatile __u16 *)(CLKGEN_RESET_BASE + 0xC)
-#define ARM_RSTCT1 (volatile __u16 *)(CLKGEN_RESET_BASE + 0x10)
-#define ARM_RSTCT2 (volatile __u16 *)(CLKGEN_RESET_BASE + 0x14)
-#define ARM_SYSST (volatile __u16 *)(CLKGEN_RESET_BASE + 0x18)
-
-
-#define CK_CLKIN 12 /* MHz */
-#define CK_RATEF 1
-#define CK_IDLEF 2
-#define CK_ENABLEF 4
-#define CK_SELECTF 8
-#ifndef __ASSEMBLER__
-#define CK_DPLL1 ((volatile __u16 *)0xfffecf00)
-#else
-#define CK_DPLL1 (0xfffecf00)
-#endif
-#define SETARM_IDLE_SHIFT
-
-/* ARM_CKCTL bit shifts */
-#define PERDIV 0
-#define LCDDIV 2
-#define ARMDIV 4
-#define DSPDIV 6
-#define TCDIV 8
-#define DSPMMUDIV 10
-#define ARM_TIMXO 12
-#define EN_DSPCK 13
-#define ARM_INTHCK_SEL 14 /* REVISIT -- where is this used? */
-
-#define ARM_CKCTL_RSRVD_BIT15 (1 << 15)
-#define ARM_CKCTL_ARM_INTHCK_SEL (1 << 14)
-#define ARM_CKCTL_EN_DSPCK (1 << 13)
-#define ARM_CKCTL_ARM_TIMXO (1 << 12)
-#define ARM_CKCTL_DSPMMU_DIV1 (1 << 11)
-#define ARM_CKCTL_DSPMMU_DIV2 (1 << 10)
-#define ARM_CKCTL_TCDIV1 (1 << 9)
-#define ARM_CKCTL_TCDIV2 (1 << 8)
-#define ARM_CKCTL_DSPDIV1 (1 << 7)
-#define ARM_CKCTL_DSPDIV0 (1 << 6)
-#define ARM_CKCTL_ARMDIV1 (1 << 5)
-#define ARM_CKCTL_ARMDIV0 (1 << 4)
-#define ARM_CKCTL_LCDDIV1 (1 << 3)
-#define ARM_CKCTL_LCDDIV0 (1 << 2)
-#define ARM_CKCTL_PERDIV1 (1 << 1)
-#define ARM_CKCTL_PERDIV0 (1 << 0)
-
-/* ARM_IDLECT1 bit shifts */
-#define IDLWDT_ARM 0
-#define IDLXORP_ARM 1
-#define IDLPER_ARM 2
-#define IDLLCD_ARM 3
-#define IDLLB_ARM 4
-#define IDLHSAB_ARM 5
-#define IDLIF_ARM 6
-#define IDLDPLL_ARM 7
-#define IDLAPI_ARM 8
-#define IDLTIM_ARM 9
-#define SETARM_IDLE 11
-
-/* ARM_IDLECT2 bit shifts */
-#define EN_WDTCK 0
-#define EN_XORPCK 1
-#define EN_PERCK 2
-#define EN_LCDCK 3
-#define EN_LBCK 4
-#define EN_HSABCK 5
-#define EN_APICK 6
-#define EN_TIMCK 7
-#define DMACK_REQ 8
-#define EN_GPIOCK 9
-#define EN_LBFREECK 10
-
-#define ARM_RSTCT1_SW_RST (1 << 3)
-#define ARM_RSTCT1_DSP_RST (1 << 2)
-#define ARM_RSTCT1_DSP_EN (1 << 1)
-#define ARM_RSTCT1_ARM_RST (1 << 0)
-
-/* ARM_RSTCT2 bit shifts */
-#define EN_PER 0
-
-#define ARM_SYSST_RSRVD_BIT15 (1 << 15)
-#define ARM_SYSST_RSRVD_BIT14 (1 << 14)
-#define ARM_SYSST_CLOCK_SELECT2 (1 << 13)
-#define ARM_SYSST_CLOCK_SELECT1 (1 << 12)
-#define ARM_SYSST_CLOCK_SELECT0 (1 << 11)
-#define ARM_SYSST_RSRVD_BIT10 (1 << 10)
-#define ARM_SYSST_RSRVD_BIT9 (1 << 9)
-#define ARM_SYSST_RSRVD_BIT8 (1 << 8)
-#define ARM_SYSST_RSRVD_BIT7 (1 << 7)
-#define ARM_SYSST_IDLE_DSP (1 << 6)
-#define ARM_SYSST_POR (1 << 5)
-#define ARM_SYSST_EXT_RST (1 << 4)
-#define ARM_SYSST_ARM_MCRST (1 << 3)
-#define ARM_SYSST_ARM_WDRST (1 << 2)
-#define ARM_SYSST_GLOB_SWRST (1 << 1)
-#define ARM_SYSST_DSP_WDRST (1 << 0)
-
-/* Table 15-23. DPLL Control Registers: */
-#define DPLL_CTL_REG (volatile __u16 *)(0xfffecf00)
-
-/* Table 15-24. Control Register (CTL_REG): */
-
-#define DPLL_CTL_REG_IOB (1 << 13)
-#define DPLL_CTL_REG_PLL_MULT Fld(5,0)
-
-/*****************************************************************************/
-
-/* OMAP INTERRUPT REGISTERS */
-#define IRQ_ITR 0x00
-#define IRQ_MIR 0x04
-#define IRQ_SIR_IRQ 0x10
-#define IRQ_SIR_FIQ 0x14
-#define IRQ_CONTROL_REG 0x18
-#define IRQ_ISR 0x9c
-#define IRQ_ILR0 0x1c
-
-#define REG_IHL1_MIR (OMAP_IH1_BASE+IRQ_MIR)
-#define REG_IHL2_MIR (OMAP_IH2_BASE+IRQ_MIR)
-
-/* INTERRUPT LEVEL REGISTER BITS */
-#define ILR_PRIORITY_MASK (0x3c)
-#define ILR_PRIORITY_SHIFT (2)
-#define ILR_LEVEL_TRIGGER (1<<1)
-#define ILR_FIQ (1<<0)
-
-#define IRQ_LEVEL_INT 1
-#define IRQ_EDGE_INT 0
-
-/* Macros to access registers */
-#define outb(v,p) *(volatile u8 *) (p) = v
-#define outw(v,p) *(volatile u16 *) (p) = v
-#define outl(v,p) *(volatile u32 *) (p) = v
-
-#define inb(p) *(volatile u8 *) (p)
-#define inw(p) *(volatile u16 *) (p)
-#define inl(p) *(volatile u32 *) (p)
diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h
deleted file mode 100644
index 376dfdb..0000000
--- a/include/configs/omap5912osk.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * (C) Copyright 2003
- * Texas Instruments.
- * Kshitij Gupta <kshitij@ti.com>
- * Configuation settings for the TI OMAP Innovator board.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_ARM926EJS 1 /* This is an arm926ejs CPU core */
-#define CONFIG_OMAP 1 /* in a TI OMAP core */
-#define CONFIG_OMAP1610 1 /* 5912 is same as 1610 */
-#define CONFIG_OSK_OMAP5912 1 /* a OSK Board */
-
-#define CONFIG_DISPLAY_CPUINFO 1 /* display cpu info (and speed) */
-#define CONFIG_DISPLAY_BOARDINFO 1 /* display board info */
-
-/* input clock of PLL */
-/* the OMAP5912 OSK has 12MHz input clock */
-#define CONFIG_SYS_CLK_FREQ 12000000
-
-#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS 1
-#define CONFIG_INITRD_TAG 1 /* Required for ramdisk support */
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
-
-/*
- * Hardware drivers
- */
-/*
-*/
-#define CONFIG_LAN91C96
-#define CONFIG_LAN91C96_BASE 0x04800300
-#define CONFIG_LAN91C96_EXT_PHY
-
-/*
- * NS16550 Configuration
- */
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE (-4)
-#define CONFIG_SYS_NS16550_CLK (48000000) /* can be 12M/32Khz or 48Mhz */
-#define CONFIG_SYS_NS16550_COM1 0xfffb0000 /* uart1, bluetooth uart
- on helen */
-
-/*
- * select serial console configuration
- */
-#define CONFIG_SERIAL1 1 /* we use SERIAL 1 on OMAP5912 OSK */
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX 1
-#define CONFIG_BAUDRATE 115200
-
-/*
- * Command line configuration.
- */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_DHCP
-
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_SUBNETMASK
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-#define CONFIG_BOOTP_BOOTPATH
-
-
-#include <configs/omap1510.h>
-
-#define CONFIG_BOOTDELAY 3
-#define CONFIG_BOOTARGS "mem=32M console=ttyS0,115200n8 noinitrd \
- root=/dev/nfs rw nfsroot=157.87.82.48:\
- /home/mwd/myfs/target ip=dhcp"
-#define CONFIG_NETMASK 255.255.254.0 /* talk on MY local net */
-#define CONFIG_IPADDR 156.117.97.156 /* static IP I currently own */
-#define CONFIG_SERVERIP 156.117.97.139 /* current IP of my dev pc */
-#define CONFIG_BOOTFILE "uImage" /* file to load */
-
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */
-#endif
-
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP /* undef to save memory */
-#define CONFIG_SYS_PROMPT "OMAP5912 OSK # " /* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_MEMTEST_START 0x10000000 /* memtest works on */
-#define CONFIG_SYS_MEMTEST_END 0x12000000 /* 32 MB in DRAM */
-
-#define CONFIG_SYS_LOAD_ADDR 0x10000000 /* default load address */
-
-/* The 1610 has 6 timers, they can be driven by the RefClk (12Mhz) or by
- * DPLL1. This time is further subdivided by a local divisor.
- */
-#define CONFIG_SYS_TIMERBASE 0xFFFEC500 /* use timer 1 */
-#define CONFIG_SYS_PTV 7 /* 2^(PTV+1), divide by 256 */
-
-/*-----------------------------------------------------------------------
- * Physical Memory Map
- */
-#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
-#define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */
-#define PHYS_SDRAM_1_SIZE 0x02000000 /* 32 MB */
-
-#define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */
-#define PHYS_FLASH_2 0x01000000 /* Flash Bank #2 */
-
-#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1
-
-#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Monitor at beginning of flash */
-
-#define PHYS_SRAM 0x20000000
-
-/*-----------------------------------------------------------------------
- * FLASH driver setup
- */
-#define CONFIG_SYS_FLASH_CFI 1 /* Flash memory is CFI compliant */
-#define CONFIG_FLASH_CFI_DRIVER 1 /* Use drivers/mtd/cfi_flash.c */
-
-#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 }
-
-#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of memory banks */
-#define PHYS_FLASH_SIZE 0x02000000 /* 32MB */
-#define CONFIG_SYS_MAX_FLASH_SECT (259) /* max number of sectors on one chip */
-
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 /* Use buffered writes (~10x faster) */
-#define CONFIG_SYS_FLASH_PROTECTION 1 /* Use hardware sector protection */
-
-#define CONFIG_SYS_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */
-
-/* timeout values are in ticks */
-#define CONFIG_SYS_FLASH_ERASE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
-#define CONFIG_SYS_FLASH_WRITE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Write */
-
-/*-----------------------------------------------------------------------
- * FLASH and environment organization
- */
-#define CONFIG_ENV_IS_IN_FLASH 1
-/* addr of environment */
-#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
-
-#define CONFIG_ENV_SIZE 0x20000 /* Total Size of Environment Sector */
-#define CONFIG_ENV_OFFSET 0x40000 /* environment starts here */
-
-#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_ADDR PHYS_SRAM
-#define CONFIG_SYS_INIT_RAM_SIZE (250 * 1024)
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
- CONFIG_SYS_INIT_RAM_SIZE)
-
-#endif /* __CONFIG_H */
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 01/15] omap: remove omap5912osk board support Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 6:39 ` [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings Michal Simek
2014-08-06 3:17 ` [U-Boot] [PATCH v2 03/15] tegra: kconfig: move board select menu and common settings Masahiro Yamada
` (13 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Michal Simek <michal.simek@xilinx.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e97f94d..f4faffc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/arch/arm/cpu/armv7/zynq/Kconfig b/arch/arm/cpu/armv7/zynq/Kconfig
new file mode 100644
index 0000000..6b88f18
--- /dev/null
+++ b/arch/arm/cpu/armv7/zynq/Kconfig
@@ -0,0 +1,43 @@
+if ZYNQ
+
+choice
+ prompt "Xilinx Zynq board select"
+
+config TARGET_ZYNQ_ZED
+ bool "Zynq ZedBoard"
+
+config TARGET_ZYNQ_MICROZED
+ bool "Zynq MicroZed"
+
+config TARGET_ZYNQ_ZC70X
+ bool "Zynq ZC702/ZC706 Board"
+
+config TARGET_ZYNQ_ZC770
+ bool "Zynq ZC770 Board"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "armv7"
+
+config SYS_BOARD
+ string
+ default "zynq"
+
+config SYS_VENDOR
+ string
+ default "xilinx"
+
+config SYS_SOC
+ string
+ default "zynq"
+
+config SYS_CONFIG_NAME
+ string
+ default "zynq_zed" if TARGET_ZYNQ_ZED
+ default "zynq_microzed" if TARGET_ZYNQ_MICROZED
+ default "zynq_zc70x" if TARGET_ZYNQ_ZC70X
+ default "zynq_zc770" if TARGET_ZYNQ_ZC770
+
+endif
diff --git a/board/xilinx/zynq/Kconfig b/board/xilinx/zynq/Kconfig
deleted file mode 100644
index 3b72a5f..0000000
--- a/board/xilinx/zynq/Kconfig
+++ /dev/null
@@ -1,95 +0,0 @@
-if TARGET_ZYNQ_MICROZED
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_microzed"
-
-endif
-
-if TARGET_ZYNQ_ZC70X
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_zc70x"
-
-endif
-
-if TARGET_ZYNQ_ZC770
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_zc770"
-
-endif
-
-if TARGET_ZYNQ_ZED
-
-config SYS_CPU
- string
- default "armv7"
-
-config SYS_BOARD
- string
- default "zynq"
-
-config SYS_VENDOR
- string
- default "xilinx"
-
-config SYS_SOC
- string
- default "zynq"
-
-config SYS_CONFIG_NAME
- string
- default "zynq_zed"
-
-endif
diff --git a/board/xilinx/zynq/MAINTAINERS b/board/xilinx/zynq/MAINTAINERS
index e167816..382e921 100644
--- a/board/xilinx/zynq/MAINTAINERS
+++ b/board/xilinx/zynq/MAINTAINERS
@@ -3,13 +3,5 @@ M: Michal Simek <monstr@monstr.eu>
M: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
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
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 14024d0..3aedb35 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_MICROZED=y
diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig
index d2e79a5..04c8def 100644
--- a/configs/zynq_zc70x_defconfig
+++ b/configs/zynq_zc70x_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZC70X=y
diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index e9f9c4b..1178b40 100644
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -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
diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig
index 78f1fe6..52c2121 100644
--- a/configs/zynq_zc770_xm012_defconfig
+++ b/configs/zynq_zc770_xm012_defconfig
@@ -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
diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig
index d96e8ff..836809a 100644
--- a/configs/zynq_zc770_xm013_defconfig
+++ b/configs/zynq_zc770_xm013_defconfig
@@ -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
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index abf7e82..2337906 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ZYNQ=y
+S:CONFIG_TARGET_ZYNQ_ZED=y
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index d57e9d5..875cb43 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -12,7 +12,6 @@
/* High Level configuration Options */
#define CONFIG_ARMV7
-#define CONFIG_ZYNQ
/* CPU clock */
#ifndef CONFIG_CPU_FREQ_HZ
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 3:17 ` [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and common settings Masahiro Yamada
@ 2014-08-06 6:39 ` Michal Simek
2014-08-06 6:49 ` Masahiro Yamada
0 siblings, 1 reply; 37+ messages in thread
From: Michal Simek @ 2014-08-06 6:39 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On 08/06/2014 05:17 AM, Masahiro Yamada wrote:
> 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.
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Michal Simek <michal.simek@xilinx.com>
> ---
>
> Changes in v2: None
>
> 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
One
One thing I have noticed was that when I run
[u-boot]$ make zynq_zc70x_defconfig
...
there is incorrect CONFIG_DEFCONFIG_LIST setup
[u-boot]$ head .config
#
# Automatically generated file; DO NOT EDIT.
# U-Boot 2014.07 Configuration
#
CONFIG_DEFCONFIG_LIST="configs/sandbox_defconfig"
#
# General setup
#
CONFIG_SPL=y
BTW: I would keep that options sorted
? ? (X) Xilinx Zynq Platform ? ?
? ? ( ) NVIDIA Tegra | |
The rest for zynq is fine.
Tested-by: Michal Simek <michal.simek@xilinx.com>
Thanks,
Michal
^ permalink raw reply [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 6:39 ` [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings Michal Simek
@ 2014-08-06 6:49 ` Masahiro Yamada
2014-08-06 7:57 ` Michal Simek
0 siblings, 1 reply; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 6:49 UTC (permalink / raw)
To: u-boot
Hi Michal,
On Wed, 6 Aug 2014 08:39:47 +0200
Michal Simek <michal.simek@xilinx.com> wrote:
> Hi Masahiro,
>
> On 08/06/2014 05:17 AM, Masahiro Yamada wrote:
> > 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.
> >
> > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > Cc: Michal Simek <michal.simek@xilinx.com>
> > ---
> >
> > Changes in v2: None
> >
> > 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
> One
> One thing I have noticed was that when I run
> [u-boot]$ make zynq_zc70x_defconfig
> ...
>
> there is incorrect CONFIG_DEFCONFIG_LIST setup
>
> [u-boot]$ head .config
> #
> # Automatically generated file; DO NOT EDIT.
> # U-Boot 2014.07 Configuration
> #
> CONFIG_DEFCONFIG_LIST="configs/sandbox_defconfig"
I assume you thought having sandbox_defconfig in ARM .config
is weird.
But I think this is correct.
Unlike Linux, defconfig has a flat structure in U-Boot
because ARCH=arm is not given from the command line.
Sandbox is the default when no defconfig is specified
although this is not related to this series at all.
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 6:49 ` Masahiro Yamada
@ 2014-08-06 7:57 ` Michal Simek
2014-08-06 8:31 ` Masahiro Yamada
0 siblings, 1 reply; 37+ messages in thread
From: Michal Simek @ 2014-08-06 7:57 UTC (permalink / raw)
To: u-boot
On 08/06/2014 08:49 AM, Masahiro Yamada wrote:
> Hi Michal,
>
>
> On Wed, 6 Aug 2014 08:39:47 +0200
> Michal Simek <michal.simek@xilinx.com> wrote:
>
>> Hi Masahiro,
>>
>> On 08/06/2014 05:17 AM, Masahiro Yamada wrote:
>>> 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.
>>>
>>> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
>>> Cc: Michal Simek <michal.simek@xilinx.com>
>>> ---
>>>
>>> Changes in v2: None
>>>
>>> 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
>> One
>> One thing I have noticed was that when I run
>> [u-boot]$ make zynq_zc70x_defconfig
>> ...
>>
>> there is incorrect CONFIG_DEFCONFIG_LIST setup
>>
>> [u-boot]$ head .config
>> #
>> # Automatically generated file; DO NOT EDIT.
>> # U-Boot 2014.07 Configuration
>> #
>> CONFIG_DEFCONFIG_LIST="configs/sandbox_defconfig"
>
> I assume you thought having sandbox_defconfig in ARM .config
> is weird.
Not exactly this. My expectation was that when I use
zynq_zc70x_defconfig that it will be listed there instead of sandbox one.
Or just CONFIG_DEFCONFIG_LIST not there.
> But I think this is correct.
>
> Unlike Linux, defconfig has a flat structure in U-Boot
> because ARCH=arm is not given from the command line.
Even if ARCH=arm is passed behavior is the same
[u-boot]$ make ARCH=arm zynq_zc70x_defconfig
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
SHIPPED scripts/kconfig/zconf.tab.c
SHIPPED scripts/kconfig/zconf.lex.c
SHIPPED scripts/kconfig/zconf.hash.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
#
# configuration written to .config
#
#
# configuration written to spl/.config
#
[u-boot]$ head .config
#
# Automatically generated file; DO NOT EDIT.
# U-Boot 2014.07 Configuration
#
CONFIG_DEFCONFIG_LIST="configs/sandbox_defconfig"
#
# General setup
#
CONFIG_SPL=y
Is DEFCONFIG_LIST used anywhere?
I just want to know what is this for.
>
> Sandbox is the default when no defconfig is specified
> although this is not related to this series at all.
yes it is not related that's why I have given you
Tested-by for that patch.
Thanks,
Michal
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 7:57 ` Michal Simek
@ 2014-08-06 8:31 ` Masahiro Yamada
2014-08-06 9:10 ` Michal Simek
0 siblings, 1 reply; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 8:31 UTC (permalink / raw)
To: u-boot
Hi Michal,
On Wed, 6 Aug 2014 09:57:46 +0200
Michal Simek <michal.simek@xilinx.com> wrote:
> On 08/06/2014 08:49 AM, Masahiro Yamada wrote:
> > Hi Michal,
> >
> >
> > On Wed, 6 Aug 2014 08:39:47 +0200
> > Michal Simek <michal.simek@xilinx.com> wrote:
> >
> >> Hi Masahiro,
> >>
> >> On 08/06/2014 05:17 AM, Masahiro Yamada wrote:
> >>> 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.
> >>>
> >>> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> >>> Cc: Michal Simek <michal.simek@xilinx.com>
> >>> ---
> >>>
> >>> Changes in v2: None
> >>>
> >>> 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
> >> One
> >> One thing I have noticed was that when I run
> >> [u-boot]$ make zynq_zc70x_defconfig
> >> ...
> >>
> >> there is incorrect CONFIG_DEFCONFIG_LIST setup
> >>
> >> [u-boot]$ head .config
> >> #
> >> # Automatically generated file; DO NOT EDIT.
> >> # U-Boot 2014.07 Configuration
> >> #
> >> CONFIG_DEFCONFIG_LIST="configs/sandbox_defconfig"
> >
> > I assume you thought having sandbox_defconfig in ARM .config
> > is weird.
>
> Not exactly this. My expectation was that when I use
> zynq_zc70x_defconfig that it will be listed there instead of sandbox one.
> Or just CONFIG_DEFCONFIG_LIST not there.
>
> > But I think this is correct.
> >
> > Unlike Linux, defconfig has a flat structure in U-Boot
> > because ARCH=arm is not given from the command line.
>
> Even if ARCH=arm is passed behavior is the same
Yes. Giving ARCH is meaningless in U-Boot.
>
> Is DEFCONFIG_LIST used anywhere?
> I just want to know what is this for.
I set the default value just in case.
The only difference I noticed is "make savedefconfig".
If .config does not exist, "make savedefconfig" uses
DEFCONFIG_LIST as its default.
With "config DEFCONFIG_LIST",
$ rm -f .config*
$ make savedefconfig
scripts/kconfig/conf --savedefconfig=defconfig Kconfig
#
# using defaults found in configs/sandbox_defconfig
#
But if we comment out DEFCONFIG_LIST,
$ rm -f .config*
$ make savedefconfig
scripts/kconfig/conf --savedefconfig=defconfig Kconfig
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 8:31 ` Masahiro Yamada
@ 2014-08-06 9:10 ` Michal Simek
2014-08-06 9:48 ` Masahiro Yamada
0 siblings, 1 reply; 37+ messages in thread
From: Michal Simek @ 2014-08-06 9:10 UTC (permalink / raw)
To: u-boot
On 08/06/2014 10:31 AM, Masahiro Yamada wrote:
> Hi Michal,
>
>
>
> On Wed, 6 Aug 2014 09:57:46 +0200
> Michal Simek <michal.simek@xilinx.com> wrote:
>
>> On 08/06/2014 08:49 AM, Masahiro Yamada wrote:
>>> Hi Michal,
>>>
>>>
>>> On Wed, 6 Aug 2014 08:39:47 +0200
>>> Michal Simek <michal.simek@xilinx.com> wrote:
>>>
>>>> Hi Masahiro,
>>>>
>>>> On 08/06/2014 05:17 AM, Masahiro Yamada wrote:
>>>>> 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.
>>>>>
>>>>> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
>>>>> Cc: Michal Simek <michal.simek@xilinx.com>
>>>>> ---
>>>>>
>>>>> Changes in v2: None
>>>>>
>>>>> 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
>>>> One
>>>> One thing I have noticed was that when I run
>>>> [u-boot]$ make zynq_zc70x_defconfig
>>>> ...
>>>>
>>>> there is incorrect CONFIG_DEFCONFIG_LIST setup
>>>>
>>>> [u-boot]$ head .config
>>>> #
>>>> # Automatically generated file; DO NOT EDIT.
>>>> # U-Boot 2014.07 Configuration
>>>> #
>>>> CONFIG_DEFCONFIG_LIST="configs/sandbox_defconfig"
>>>
>>> I assume you thought having sandbox_defconfig in ARM .config
>>> is weird.
>>
>> Not exactly this. My expectation was that when I use
>> zynq_zc70x_defconfig that it will be listed there instead of sandbox one.
>> Or just CONFIG_DEFCONFIG_LIST not there.
>>
>>> But I think this is correct.
>>>
>>> Unlike Linux, defconfig has a flat structure in U-Boot
>>> because ARCH=arm is not given from the command line.
>>
>> Even if ARCH=arm is passed behavior is the same
>
> Yes. Giving ARCH is meaningless in U-Boot.
>
>
>
>>
>> Is DEFCONFIG_LIST used anywhere?
>> I just want to know what is this for.
>
> I set the default value just in case.
> The only difference I noticed is "make savedefconfig".
>
>
> If .config does not exist, "make savedefconfig" uses
> DEFCONFIG_LIST as its default.
>
>
> With "config DEFCONFIG_LIST",
>
> $ rm -f .config*
> $ make savedefconfig
> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
> #
> # using defaults found in configs/sandbox_defconfig
> #
>
>
> But if we comment out DEFCONFIG_LIST,
>
>
> $ rm -f .config*
> $ make savedefconfig
> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
>
Based on steps below - defconfigs are both empty.
Linux kernel is taking .config from /boot/config-`uname -r`.
Maybe I do something wrong and Kconfig handles it differently
but currently I can't see a reason to have this option there.
Thanks,
Michal
[u-boot]$ make mrproper
[u-boot]$ make savedefconfig
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
SHIPPED scripts/kconfig/zconf.tab.c
SHIPPED scripts/kconfig/zconf.lex.c
SHIPPED scripts/kconfig/zconf.hash.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --savedefconfig=defconfig Kconfig
#
# using defaults found in configs/sandbox_defconfig
#
[u-boot]$ cat defconfig
[u-boot]$ vim Kconfig
[u-boot]$ git diff
diff --git a/Kconfig b/Kconfig
index 9e77a6e28b46..1a3864557df4 100644
--- a/Kconfig
+++ b/Kconfig
@@ -12,12 +12,6 @@ config KCONFIG_OBJDIR
string
option env="KCONFIG_OBJDIR"
-config DEFCONFIG_LIST
- string
- depends on !SPL_BUILD
- option defconfig_list
- default "configs/sandbox_defconfig"
-
menu "General setup"
config SPL_BUILD
[u-boot]$ make mrproper
CLEAN scripts/basic
CLEAN scripts/kconfig
[u-boot]$ make savedefconfig
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
SHIPPED scripts/kconfig/zconf.tab.c
SHIPPED scripts/kconfig/zconf.lex.c
SHIPPED scripts/kconfig/zconf.hash.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --savedefconfig=defconfig Kconfig
[u-boot]$ cat defconfig
[u-boot]$
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 9:10 ` Michal Simek
@ 2014-08-06 9:48 ` Masahiro Yamada
2014-08-06 11:27 ` Michal Simek
2014-08-06 11:27 ` Michal Simek
0 siblings, 2 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 9:48 UTC (permalink / raw)
To: u-boot
Hi Michal,
On Wed, 6 Aug 2014 11:10:14 +0200
Michal Simek <michal.simek@xilinx.com> wrote:
>
> Based on steps below - defconfigs are both empty.
> Linux kernel is taking .config from /boot/config-`uname -r`.
Yes, but the .config of U-Boot is not installed anywhere in the host PC.
I guess that is why DEFCONFIG_LIST seems meaningless...
I have to admit I am still searching for the usage of this option.
> Maybe I do something wrong and Kconfig handles it differently
> but currently I can't see a reason to have this option there.
I don't think you did anything wrong.
> [u-boot]$ make mrproper
> [u-boot]$ make savedefconfig
> HOSTCC scripts/basic/fixdep
> HOSTCC scripts/kconfig/conf.o
> SHIPPED scripts/kconfig/zconf.tab.c
> SHIPPED scripts/kconfig/zconf.lex.c
> SHIPPED scripts/kconfig/zconf.hash.c
> HOSTCC scripts/kconfig/zconf.tab.o
> HOSTLD scripts/kconfig/conf
> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
> #
> # using defaults found in configs/sandbox_defconfig
> #
> [u-boot]$ cat defconfig
In this case, savedefconfig was done based on
configs/sandbox_defconfig which is empty for now,
but which will have more options in the future.
> [u-boot]$ vim Kconfig
> [u-boot]$ git diff
> diff --git a/Kconfig b/Kconfig
> index 9e77a6e28b46..1a3864557df4 100644
> --- a/Kconfig
> +++ b/Kconfig
> @@ -12,12 +12,6 @@ config KCONFIG_OBJDIR
> string
> option env="KCONFIG_OBJDIR"
>
> -config DEFCONFIG_LIST
> - string
> - depends on !SPL_BUILD
> - option defconfig_list
> - default "configs/sandbox_defconfig"
> -
> menu "General setup"
>
> config SPL_BUILD
> [u-boot]$ make mrproper
> CLEAN scripts/basic
> CLEAN scripts/kconfig
> [u-boot]$ make savedefconfig
> HOSTCC scripts/basic/fixdep
> HOSTCC scripts/kconfig/conf.o
> SHIPPED scripts/kconfig/zconf.tab.c
> SHIPPED scripts/kconfig/zconf.lex.c
> SHIPPED scripts/kconfig/zconf.hash.c
> HOSTCC scripts/kconfig/zconf.tab.o
> HOSTLD scripts/kconfig/conf
> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
> [u-boot]$ cat defconfig
> [u-boot]$
>
Whereas, this case, savedefconfig failed,
that is why the file is empty.
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 9:48 ` Masahiro Yamada
@ 2014-08-06 11:27 ` Michal Simek
2014-08-18 2:55 ` Masahiro Yamada
2014-08-06 11:27 ` Michal Simek
1 sibling, 1 reply; 37+ messages in thread
From: Michal Simek @ 2014-08-06 11:27 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On 08/06/2014 11:48 AM, Masahiro Yamada wrote:
> Hi Michal,
>
>
> On Wed, 6 Aug 2014 11:10:14 +0200
> Michal Simek <michal.simek@xilinx.com> wrote:
>
>
>>
>> Based on steps below - defconfigs are both empty.
>> Linux kernel is taking .config from /boot/config-`uname -r`.
>
> Yes, but the .config of U-Boot is not installed anywhere in the host PC.
> I guess that is why DEFCONFIG_LIST seems meaningless...
>
> I have to admit I am still searching for the usage of this option.
ok. great..
>> Maybe I do something wrong and Kconfig handles it differently
>> but currently I can't see a reason to have this option there.
>
>
> I don't think you did anything wrong.
>
>
>> [u-boot]$ make mrproper
>> [u-boot]$ make savedefconfig
>> HOSTCC scripts/basic/fixdep
>> HOSTCC scripts/kconfig/conf.o
>> SHIPPED scripts/kconfig/zconf.tab.c
>> SHIPPED scripts/kconfig/zconf.lex.c
>> SHIPPED scripts/kconfig/zconf.hash.c
>> HOSTCC scripts/kconfig/zconf.tab.o
>> HOSTLD scripts/kconfig/conf
>> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
>> #
>> # using defaults found in configs/sandbox_defconfig
>> #
>> [u-boot]$ cat defconfig
>
> In this case, savedefconfig was done based on
> configs/sandbox_defconfig which is empty for now,
> but which will have more options in the future.
No problem with that.
The question and my concern is that every .config
will contain this line and this is just one usage
which is questionable. IMHO if there is no .config
savedefconfig should failed to let user to know
that something is wrong. But that's just my opinion.
>> [u-boot]$ vim Kconfig
>> [u-boot]$ git diff
>> diff --git a/Kconfig b/Kconfig
>> index 9e77a6e28b46..1a3864557df4 100644
>> --- a/Kconfig
>> +++ b/Kconfig
>> @@ -12,12 +12,6 @@ config KCONFIG_OBJDIR
>> string
>> option env="KCONFIG_OBJDIR"
>>
>> -config DEFCONFIG_LIST
>> - string
>> - depends on !SPL_BUILD
>> - option defconfig_list
>> - default "configs/sandbox_defconfig"
>> -
>> menu "General setup"
>>
>> config SPL_BUILD
>> [u-boot]$ make mrproper
>> CLEAN scripts/basic
>> CLEAN scripts/kconfig
>> [u-boot]$ make savedefconfig
>> HOSTCC scripts/basic/fixdep
>> HOSTCC scripts/kconfig/conf.o
>> SHIPPED scripts/kconfig/zconf.tab.c
>> SHIPPED scripts/kconfig/zconf.lex.c
>> SHIPPED scripts/kconfig/zconf.hash.c
>> HOSTCC scripts/kconfig/zconf.tab.o
>> HOSTLD scripts/kconfig/conf
>> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
>> [u-boot]$ cat defconfig
>> [u-boot]$
>>
>
> Whereas, this case, savedefconfig failed,
> that is why the file is empty.
It doesn't look at it is failing - just don't use that default one.
[u-boot]$ make mrproper
CLEAN scripts/basic
CLEAN scripts/kconfig
[u-boot]$ git diff
diff --git a/Kconfig b/Kconfig
index 9e77a6e28b46..1a3864557df4 100644
--- a/Kconfig
+++ b/Kconfig
@@ -12,12 +12,6 @@ config KCONFIG_OBJDIR
string
option env="KCONFIG_OBJDIR"
-config DEFCONFIG_LIST
- string
- depends on !SPL_BUILD
- option defconfig_list
- default "configs/sandbox_defconfig"
-
menu "General setup"
config SPL_BUILD
[u-boot]$ make savedefconfig
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
SHIPPED scripts/kconfig/zconf.tab.c
SHIPPED scripts/kconfig/zconf.lex.c
SHIPPED scripts/kconfig/zconf.hash.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --savedefconfig=defconfig Kconfig
[u-boot]$ echo $?
0
[u-boot]$
Thanks,
Michal
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 11:27 ` Michal Simek
@ 2014-08-18 2:55 ` Masahiro Yamada
0 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-18 2:55 UTC (permalink / raw)
To: u-boot
Hi Michal,
On Wed, 6 Aug 2014 13:27:27 +0200
Michal Simek <michal.simek@xilinx.com> wrote:
> >
> > In this case, savedefconfig was done based on
> > configs/sandbox_defconfig which is empty for now,
> > but which will have more options in the future.
>
> No problem with that.
> The question and my concern is that every .config
> will contain this line and this is just one usage
> which is questionable. IMHO if there is no .config
> savedefconfig should failed to let user to know
> that something is wrong. But that's just my opinion.
Finally, I have posted a patch.
http://patchwork.ozlabs.org/patch/380400/
> >
> > Whereas, this case, savedefconfig failed,
> > that is why the file is empty.
>
> It doesn't look at it is failing - just don't use that default one.
You are right. It seems to exit successfully with doing nothing.
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and commonsettings
2014-08-06 9:48 ` Masahiro Yamada
2014-08-06 11:27 ` Michal Simek
@ 2014-08-06 11:27 ` Michal Simek
1 sibling, 0 replies; 37+ messages in thread
From: Michal Simek @ 2014-08-06 11:27 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
On 08/06/2014 11:48 AM, Masahiro Yamada wrote:
> Hi Michal,
>
>
> On Wed, 6 Aug 2014 11:10:14 +0200
> Michal Simek <michal.simek@xilinx.com> wrote:
>
>
>>
>> Based on steps below - defconfigs are both empty.
>> Linux kernel is taking .config from /boot/config-`uname -r`.
>
> Yes, but the .config of U-Boot is not installed anywhere in the host PC.
> I guess that is why DEFCONFIG_LIST seems meaningless...
>
> I have to admit I am still searching for the usage of this option.
ok. great..
>> Maybe I do something wrong and Kconfig handles it differently
>> but currently I can't see a reason to have this option there.
>
>
> I don't think you did anything wrong.
>
>
>> [u-boot]$ make mrproper
>> [u-boot]$ make savedefconfig
>> HOSTCC scripts/basic/fixdep
>> HOSTCC scripts/kconfig/conf.o
>> SHIPPED scripts/kconfig/zconf.tab.c
>> SHIPPED scripts/kconfig/zconf.lex.c
>> SHIPPED scripts/kconfig/zconf.hash.c
>> HOSTCC scripts/kconfig/zconf.tab.o
>> HOSTLD scripts/kconfig/conf
>> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
>> #
>> # using defaults found in configs/sandbox_defconfig
>> #
>> [u-boot]$ cat defconfig
>
> In this case, savedefconfig was done based on
> configs/sandbox_defconfig which is empty for now,
> but which will have more options in the future.
No problem with that.
The question and my concern is that every .config
will contain this line and this is just one usage
which is questionable. IMHO if there is no .config
savedefconfig should failed to let user to know
that something is wrong. But that's just my opinion.
>> [u-boot]$ vim Kconfig
>> [u-boot]$ git diff
>> diff --git a/Kconfig b/Kconfig
>> index 9e77a6e28b46..1a3864557df4 100644
>> --- a/Kconfig
>> +++ b/Kconfig
>> @@ -12,12 +12,6 @@ config KCONFIG_OBJDIR
>> string
>> option env="KCONFIG_OBJDIR"
>>
>> -config DEFCONFIG_LIST
>> - string
>> - depends on !SPL_BUILD
>> - option defconfig_list
>> - default "configs/sandbox_defconfig"
>> -
>> menu "General setup"
>>
>> config SPL_BUILD
>> [u-boot]$ make mrproper
>> CLEAN scripts/basic
>> CLEAN scripts/kconfig
>> [u-boot]$ make savedefconfig
>> HOSTCC scripts/basic/fixdep
>> HOSTCC scripts/kconfig/conf.o
>> SHIPPED scripts/kconfig/zconf.tab.c
>> SHIPPED scripts/kconfig/zconf.lex.c
>> SHIPPED scripts/kconfig/zconf.hash.c
>> HOSTCC scripts/kconfig/zconf.tab.o
>> HOSTLD scripts/kconfig/conf
>> scripts/kconfig/conf --savedefconfig=defconfig Kconfig
>> [u-boot]$ cat defconfig
>> [u-boot]$
>>
>
> Whereas, this case, savedefconfig failed,
> that is why the file is empty.
It doesn't look at it is failing - just don't use that default one.
[u-boot]$ make mrproper
CLEAN scripts/basic
CLEAN scripts/kconfig
[u-boot]$ git diff
diff --git a/Kconfig b/Kconfig
index 9e77a6e28b46..1a3864557df4 100644
--- a/Kconfig
+++ b/Kconfig
@@ -12,12 +12,6 @@ config KCONFIG_OBJDIR
string
option env="KCONFIG_OBJDIR"
-config DEFCONFIG_LIST
- string
- depends on !SPL_BUILD
- option defconfig_list
- default "configs/sandbox_defconfig"
-
menu "General setup"
config SPL_BUILD
[u-boot]$ make savedefconfig
HOSTCC scripts/basic/fixdep
HOSTCC scripts/kconfig/conf.o
SHIPPED scripts/kconfig/zconf.tab.c
SHIPPED scripts/kconfig/zconf.lex.c
SHIPPED scripts/kconfig/zconf.hash.c
HOSTCC scripts/kconfig/zconf.tab.o
HOSTLD scripts/kconfig/conf
scripts/kconfig/conf --savedefconfig=defconfig Kconfig
[u-boot]$ echo $?
0
[u-boot]$
Thanks,
Michal
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 03/15] tegra: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 01/15] omap: remove omap5912osk board support Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 02/15] zynq: kconfig: move board select menu and common settings Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 04/15] rmobile: " Masahiro Yamada
` (12 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Tom Warren <twarren@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
---
Changes in v2:
- Fix board names (The names were taken from DTS)
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f4faffc..812e8af 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig
new file mode 100644
index 0000000..8e2153b
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
@@ -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
diff --git a/arch/arm/cpu/armv7/tegra114/Kconfig b/arch/arm/cpu/armv7/tegra114/Kconfig
new file mode 100644
index 0000000..33a22da
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra114/Kconfig
@@ -0,0 +1,17 @@
+if TEGRA114
+
+choice
+ prompt "Tegra114 board select"
+
+config TARGET_DALMORE
+ bool "NVIDIA Tegra114 Dalmore evaluation board"
+
+endchoice
+
+config SYS_SOC
+ string
+ default "tegra114"
+
+source "board/nvidia/dalmore/Kconfig"
+
+endif
diff --git a/arch/arm/cpu/armv7/tegra124/Kconfig b/arch/arm/cpu/armv7/tegra124/Kconfig
new file mode 100644
index 0000000..753f511
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra124/Kconfig
@@ -0,0 +1,21 @@
+if TEGRA124
+
+choice
+ prompt "Tegra124 board select"
+
+config TARGET_JETSON_TK1
+ bool "NVIDIA Tegra124 Jetson TK1 board"
+
+config TARGET_VENICE2
+ bool "NVIDIA Tegra124 Venice2"
+
+endchoice
+
+config SYS_SOC
+ string
+ default "tegra124"
+
+source "board/nvidia/jetson-tk1/Kconfig"
+source "board/nvidia/venice2/Kconfig"
+
+endif
diff --git a/arch/arm/cpu/armv7/tegra20/Kconfig b/arch/arm/cpu/armv7/tegra20/Kconfig
new file mode 100644
index 0000000..e2e0890
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra20/Kconfig
@@ -0,0 +1,53 @@
+if TEGRA20
+
+choice
+ prompt "Tegra20 board select"
+
+config TARGET_HARMONY
+ bool "NVIDIA Tegra20 Harmony evaluation board"
+
+config TARGET_MEDCOM_WIDE
+ bool "Avionic Design Medcom-Wide board"
+
+config TARGET_PAZ00
+ bool "Paz00 board"
+
+config TARGET_PLUTUX
+ bool "Avionic Design Plutux board"
+
+config TARGET_SEABOARD
+ bool "NVIDIA Seaboard"
+
+config TARGET_TEC
+ bool "Avionic Design Tamonten Evaluation Carrier"
+
+config TARGET_TRIMSLICE
+ bool "Compulab TrimSlice board"
+
+config TARGET_VENTANA
+ bool "NVIDIA Tegra20 Ventana evaluation board"
+
+config TARGET_WHISTLER
+ bool "NVIDIA Tegra20 Whistler evaluation board"
+
+config TARGET_COLIBRI_T20_IRIS
+ bool "Toradex Colibri T20 board"
+
+endchoice
+
+config SYS_SOC
+ string
+ default "tegra20"
+
+source "board/nvidia/harmony/Kconfig"
+source "board/avionic-design/medcom-wide/Kconfig"
+source "board/compal/paz00/Kconfig"
+source "board/avionic-design/plutux/Kconfig"
+source "board/nvidia/seaboard/Kconfig"
+source "board/avionic-design/tec/Kconfig"
+source "board/compulab/trimslice/Kconfig"
+source "board/nvidia/ventana/Kconfig"
+source "board/nvidia/whistler/Kconfig"
+source "board/toradex/colibri_t20_iris/Kconfig"
+
+endif
diff --git a/arch/arm/cpu/armv7/tegra30/Kconfig b/arch/arm/cpu/armv7/tegra30/Kconfig
new file mode 100644
index 0000000..15fa335
--- /dev/null
+++ b/arch/arm/cpu/armv7/tegra30/Kconfig
@@ -0,0 +1,25 @@
+if TEGRA30
+
+choice
+ prompt "Tegra30 board select"
+
+config TARGET_BEAVER
+ bool "NVIDIA Tegra30 Beaver evaluation board"
+
+config TARGET_CARDHU
+ bool "NVIDIA Tegra30 Cardhu evaluation board"
+
+config TARGET_TEC_NG
+ bool "Avionic Design 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
diff --git a/arch/arm/include/asm/arch-tegra114/tegra.h b/arch/arm/include/asm/arch-tegra114/tegra.h
index 705ca57..5d426b5 100644
--- a/arch/arm/include/asm/arch-tegra114/tegra.h
+++ b/arch/arm/include/asm/arch-tegra114/tegra.h
@@ -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 */
diff --git a/arch/arm/include/asm/arch-tegra124/tegra.h b/arch/arm/include/asm/arch-tegra124/tegra.h
index 86ebd19..db3d837 100644
--- a/arch/arm/include/asm/arch-tegra124/tegra.h
+++ b/arch/arm/include/asm/arch-tegra124/tegra.h
@@ -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.) */
diff --git a/arch/arm/include/asm/arch-tegra20/tegra.h b/arch/arm/include/asm/arch-tegra20/tegra.h
index 6a4b40e..18856ac 100644
--- a/arch/arm/include/asm/arch-tegra20/tegra.h
+++ b/arch/arm/include/asm/arch-tegra20/tegra.h
@@ -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>
diff --git a/arch/arm/include/asm/arch-tegra30/tegra.h b/arch/arm/include/asm/arch-tegra30/tegra.h
index 4ad8b1c..c02c5d8 100644
--- a/arch/arm/include/asm/arch-tegra30/tegra.h
+++ b/arch/arm/include/asm/arch-tegra30/tegra.h
@@ -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>
diff --git a/board/avionic-design/medcom-wide/Kconfig b/board/avionic-design/medcom-wide/Kconfig
index 2472fe2..16001e4 100644
--- a/board/avionic-design/medcom-wide/Kconfig
+++ b/board/avionic-design/medcom-wide/Kconfig
@@ -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"
diff --git a/board/avionic-design/plutux/Kconfig b/board/avionic-design/plutux/Kconfig
index a697a54..c9a90247 100644
--- a/board/avionic-design/plutux/Kconfig
+++ b/board/avionic-design/plutux/Kconfig
@@ -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"
diff --git a/board/avionic-design/tec-ng/Kconfig b/board/avionic-design/tec-ng/Kconfig
index f52edda..e6b69e8 100644
--- a/board/avionic-design/tec-ng/Kconfig
+++ b/board/avionic-design/tec-ng/Kconfig
@@ -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"
diff --git a/board/avionic-design/tec/Kconfig b/board/avionic-design/tec/Kconfig
index d19e3f4..fbf7f46 100644
--- a/board/avionic-design/tec/Kconfig
+++ b/board/avionic-design/tec/Kconfig
@@ -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"
diff --git a/board/compal/paz00/Kconfig b/board/compal/paz00/Kconfig
index 4f0f09f..690d7a7 100644
--- a/board/compal/paz00/Kconfig
+++ b/board/compal/paz00/Kconfig
@@ -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"
diff --git a/board/compulab/trimslice/Kconfig b/board/compulab/trimslice/Kconfig
index e545f0c..6ae030c 100644
--- a/board/compulab/trimslice/Kconfig
+++ b/board/compulab/trimslice/Kconfig
@@ -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"
diff --git a/board/nvidia/beaver/Kconfig b/board/nvidia/beaver/Kconfig
index f052676..e487b66 100644
--- a/board/nvidia/beaver/Kconfig
+++ b/board/nvidia/beaver/Kconfig
@@ -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"
diff --git a/board/nvidia/cardhu/Kconfig b/board/nvidia/cardhu/Kconfig
index 9853114..150815f 100644
--- a/board/nvidia/cardhu/Kconfig
+++ b/board/nvidia/cardhu/Kconfig
@@ -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"
diff --git a/board/nvidia/dalmore/Kconfig b/board/nvidia/dalmore/Kconfig
index 33b78db..9eed19c 100644
--- a/board/nvidia/dalmore/Kconfig
+++ b/board/nvidia/dalmore/Kconfig
@@ -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"
diff --git a/board/nvidia/harmony/Kconfig b/board/nvidia/harmony/Kconfig
index 2a3bde4..7d75f2d 100644
--- a/board/nvidia/harmony/Kconfig
+++ b/board/nvidia/harmony/Kconfig
@@ -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"
diff --git a/board/nvidia/jetson-tk1/Kconfig b/board/nvidia/jetson-tk1/Kconfig
index 22b4c69..02b46b7 100644
--- a/board/nvidia/jetson-tk1/Kconfig
+++ b/board/nvidia/jetson-tk1/Kconfig
@@ -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"
diff --git a/board/nvidia/seaboard/Kconfig b/board/nvidia/seaboard/Kconfig
index 39c65b5..7863702 100644
--- a/board/nvidia/seaboard/Kconfig
+++ b/board/nvidia/seaboard/Kconfig
@@ -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"
diff --git a/board/nvidia/venice2/Kconfig b/board/nvidia/venice2/Kconfig
index 84a7160..993da79 100644
--- a/board/nvidia/venice2/Kconfig
+++ b/board/nvidia/venice2/Kconfig
@@ -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"
diff --git a/board/nvidia/ventana/Kconfig b/board/nvidia/ventana/Kconfig
index 59e85c4..95840a8 100644
--- a/board/nvidia/ventana/Kconfig
+++ b/board/nvidia/ventana/Kconfig
@@ -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"
diff --git a/board/nvidia/whistler/Kconfig b/board/nvidia/whistler/Kconfig
index f025413..113e2ef 100644
--- a/board/nvidia/whistler/Kconfig
+++ b/board/nvidia/whistler/Kconfig
@@ -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"
diff --git a/board/toradex/colibri_t20_iris/Kconfig b/board/toradex/colibri_t20_iris/Kconfig
index 334b7e0..cccdd58 100644
--- a/board/toradex/colibri_t20_iris/Kconfig
+++ b/board/toradex/colibri_t20_iris/Kconfig
@@ -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"
diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 0e70f25..7c9d94b 100644
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_BEAVER=y
diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index 564ad5a..bb042b4 100644
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA30=y
+S:CONFIG_TARGET_CARDHU=y
diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig
index 8ff2464..b2a21e1 100644
--- a/configs/colibri_t20_iris_defconfig
+++ b/configs/colibri_t20_iris_defconfig
@@ -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
diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig
index 288b238..70677aa 100644
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA114=y
+S:CONFIG_TARGET_DALMORE=y
diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index d25ea5c..a52231b 100644
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_HARMONY=y
diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 6926257..00eac92 100644
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -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
diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index ddf3437..e9a3930 100644
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -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
diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig
index 61a536e..05974eb 100644
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PAZ00=y
diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 672b66c..60e80ff 100644
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_PLUTUX=y
diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index c0f078b..516e760 100644
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_SEABOARD=y
diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 2360d25..e4a31cc 100644
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -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
diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 1aaa9d1..62a9542 100644
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TEC=y
diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig
index c096c65..94f23e3 100644
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_TRIMSLICE=y
diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index 2bfa91d..dfc5407 100644
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA124=y
+S:CONFIG_TARGET_VENICE2=y
diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 75fca96..845e241 100644
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_VENTANA=y
diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index cdc2c90..8c07c18 100644
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -1,3 +1,4 @@
-CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_TEGRA=y
++S:CONFIG_TEGRA20=y
+S:CONFIG_TARGET_WHISTLER=y
diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 717cd61..d27fceb 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -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 */
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 04/15] rmobile: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (2 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 03/15] tegra: kconfig: move board select menu and common settings Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 05/15] versatile: kconfig: move " Masahiro Yamada
` (11 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 812e8af..a288ee1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/rmobile/Kconfig b/arch/arm/cpu/armv7/rmobile/Kconfig
new file mode 100644
index 0000000..55c620a
--- /dev/null
+++ b/arch/arm/cpu/armv7/rmobile/Kconfig
@@ -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
diff --git a/board/atmark-techno/armadillo-800eva/Kconfig b/board/atmark-techno/armadillo-800eva/Kconfig
index c8f89fe..3365c7b 100644
--- a/board/atmark-techno/armadillo-800eva/Kconfig
+++ b/board/atmark-techno/armadillo-800eva/Kconfig
@@ -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"
diff --git a/board/kmc/kzm9g/Kconfig b/board/kmc/kzm9g/Kconfig
index 2d40173..ab4812f 100644
--- a/board/kmc/kzm9g/Kconfig
+++ b/board/kmc/kzm9g/Kconfig
@@ -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"
diff --git a/board/renesas/alt/Kconfig b/board/renesas/alt/Kconfig
index d317025..dc01a38 100644
--- a/board/renesas/alt/Kconfig
+++ b/board/renesas/alt/Kconfig
@@ -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"
diff --git a/board/renesas/koelsch/Kconfig b/board/renesas/koelsch/Kconfig
index 0def847..e7c6437 100644
--- a/board/renesas/koelsch/Kconfig
+++ b/board/renesas/koelsch/Kconfig
@@ -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"
diff --git a/board/renesas/lager/Kconfig b/board/renesas/lager/Kconfig
index e88f4f6..07dc98c 100644
--- a/board/renesas/lager/Kconfig
+++ b/board/renesas/lager/Kconfig
@@ -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"
diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 11a1c89..0655e60 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
CONFIG_TARGET_ALT=y
diff --git a/configs/armadillo-800eva_defconfig b/configs/armadillo-800eva_defconfig
index 081c88a..9b17895 100644
--- a/configs/armadillo-800eva_defconfig
+++ b/configs/armadillo-800eva_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
CONFIG_TARGET_ARMADILLO_800EVA=y
diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index d63a286..d59ff3d 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
CONFIG_TARGET_KOELSCH=y
diff --git a/configs/kzm9g_defconfig b/configs/kzm9g_defconfig
index aaddf82..d4d340f 100644
--- a/configs/kzm9g_defconfig
+++ b/configs/kzm9g_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
CONFIG_TARGET_KZM9G=y
diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index bf1be72..9a32d6b 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
++S:CONFIG_RMOBILE=y
CONFIG_TARGET_LAGER=y
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 9eec4bc..7238f68 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -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
diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h
index 8bb932c..b073b97 100644
--- a/include/configs/armadillo-800eva.h
+++ b/include/configs/armadillo-800eva.h
@@ -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
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 6795f28..ffb1c3b 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -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
diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 5a13ad1..ac74ae7 100644
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -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"
diff --git a/include/configs/lager.h b/include/configs/lager.h
index f39a788..8ec268b 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 05/15] versatile: kconfig: move common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (3 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 04/15] rmobile: " Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig Masahiro Yamada
` (10 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
Move Versatile-specific settings to versatile/Kconfig.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a288ee1..955fce8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/arm926ejs/versatile/Kconfig b/arch/arm/cpu/arm926ejs/versatile/Kconfig
new file mode 100644
index 0000000..fc29c98
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/versatile/Kconfig
@@ -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
diff --git a/board/armltd/versatile/Kconfig b/board/armltd/versatile/Kconfig
deleted file mode 100644
index f96d0b2..0000000
--- a/board/armltd/versatile/Kconfig
+++ /dev/null
@@ -1,71 +0,0 @@
-if TARGET_VERSATILEAB
-
-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
-
-if TARGET_VERSATILEPB
-
-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
-
-if TARGET_VERSATILEQEMU
-
-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
diff --git a/configs/versatileab_defconfig b/configs/versatileab_defconfig
index 9d64dd0..94680fe 100644
--- a/configs/versatileab_defconfig
+++ b/configs/versatileab_defconfig
@@ -1,3 +1,3 @@
CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_AB"
CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEAB=y
+CONFIG_ARCH_VERSATILE=y
diff --git a/configs/versatilepb_defconfig b/configs/versatilepb_defconfig
index fadaf93..2c59e5c 100644
--- a/configs/versatilepb_defconfig
+++ b/configs/versatilepb_defconfig
@@ -1,3 +1,3 @@
CONFIG_SYS_EXTRA_OPTIONS="ARCH_VERSATILE_PB"
CONFIG_ARM=y
-CONFIG_TARGET_VERSATILEPB=y
+CONFIG_ARCH_VERSATILE=y
diff --git a/configs/versatileqemu_defconfig b/configs/versatileqemu_defconfig
index 9d24558..fb0485d 100644
--- a/configs/versatileqemu_defconfig
+++ b/configs/versatileqemu_defconfig
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (4 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 05/15] versatile: kconfig: move " Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 10:05 ` Prafulla Wadaskar
2014-08-06 3:17 ` [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings Masahiro Yamada
` (9 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Luka Perkov <luka@openwrt.org>
---
Changes in v2:
- Fix some board names pointed out by Luka Perkov.
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 955fce8..43d0ce5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/Kconfig b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
new file mode 100644
index 0000000..58867f3
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/kirkwood/Kconfig
@@ -0,0 +1,89 @@
+if KIRKWOOD
+
+choice
+ prompt "Marvell Kirkwood board select"
+
+config TARGET_OPENRD
+ bool "Marvell OpenRD Board"
+
+config TARGET_MV88F6281GTW_GE
+ bool "MV88f6281GTW_GE Board"
+
+config TARGET_RD6281A
+ bool "RD6281A Board"
+
+config TARGET_DREAMPLUG
+ bool "DreamPlug Board"
+
+config TARGET_GURUPLUG
+ bool "GuruPlug Board"
+
+config TARGET_SHEEVAPLUG
+ bool "SheevaPlug Board"
+
+config TARGET_LSXL
+ bool "lsxl Board"
+
+config TARGET_POGO_E02
+ bool "pogo_e02 Board"
+
+config TARGET_DNS325
+ bool "dns325 Board"
+
+config TARGET_ICONNECT
+ bool "iconnect Board"
+
+config TARGET_TK71
+ bool "TK71 Board"
+
+config TARGET_KM_KIRKWOOD
+ bool "KM_KIRKWOOD Board"
+
+config TARGET_NET2BIG_V2
+ bool "LaCie 2Big Network v2 NAS Board"
+
+config TARGET_NETSPACE_V2
+ bool "LaCie netspace_v2 Board"
+
+config TARGET_WIRELESS_SPACE
+ bool "LaCie Wireless_space Board"
+
+config TARGET_IB62X0
+ bool "ib62x0 Board"
+
+config TARGET_DOCKSTAR
+ bool "Dockstar Board"
+
+config TARGET_GOFLEXHOME
+ bool "GoFlex Home Board"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "arm926ejs"
+
+config SYS_SOC
+ string
+ default "kirkwood"
+
+source "board/Marvell/openrd/Kconfig"
+source "board/Marvell/mv88f6281gtw_ge/Kconfig"
+source "board/Marvell/rd6281a/Kconfig"
+source "board/Marvell/dreamplug/Kconfig"
+source "board/Marvell/guruplug/Kconfig"
+source "board/Marvell/sheevaplug/Kconfig"
+source "board/buffalo/lsxl/Kconfig"
+source "board/cloudengines/pogo_e02/Kconfig"
+source "board/d-link/dns325/Kconfig"
+source "board/iomega/iconnect/Kconfig"
+source "board/karo/tk71/Kconfig"
+source "board/keymile/km_arm/Kconfig"
+source "board/LaCie/net2big_v2/Kconfig"
+source "board/LaCie/netspace_v2/Kconfig"
+source "board/LaCie/wireless_space/Kconfig"
+source "board/raidsonic/ib62x0/Kconfig"
+source "board/Seagate/dockstar/Kconfig"
+source "board/Seagate/goflexhome/Kconfig"
+
+endif
diff --git a/board/LaCie/net2big_v2/Kconfig b/board/LaCie/net2big_v2/Kconfig
index 867d0d3..e8eb9ad 100644
--- a/board/LaCie/net2big_v2/Kconfig
+++ b/board/LaCie/net2big_v2/Kconfig
@@ -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"
diff --git a/board/LaCie/netspace_v2/Kconfig b/board/LaCie/netspace_v2/Kconfig
index fb6fbef..6242a42 100644
--- a/board/LaCie/netspace_v2/Kconfig
+++ b/board/LaCie/netspace_v2/Kconfig
@@ -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"
diff --git a/board/LaCie/wireless_space/Kconfig b/board/LaCie/wireless_space/Kconfig
index 4815cde..ea6850f 100644
--- a/board/LaCie/wireless_space/Kconfig
+++ b/board/LaCie/wireless_space/Kconfig
@@ -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"
diff --git a/board/Marvell/dreamplug/Kconfig b/board/Marvell/dreamplug/Kconfig
index e067318..afaddf4 100644
--- a/board/Marvell/dreamplug/Kconfig
+++ b/board/Marvell/dreamplug/Kconfig
@@ -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"
diff --git a/board/Marvell/guruplug/Kconfig b/board/Marvell/guruplug/Kconfig
index fce8562..0b10e9f 100644
--- a/board/Marvell/guruplug/Kconfig
+++ b/board/Marvell/guruplug/Kconfig
@@ -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"
diff --git a/board/Marvell/mv88f6281gtw_ge/Kconfig b/board/Marvell/mv88f6281gtw_ge/Kconfig
index 17adab0..49654fe 100644
--- a/board/Marvell/mv88f6281gtw_ge/Kconfig
+++ b/board/Marvell/mv88f6281gtw_ge/Kconfig
@@ -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"
diff --git a/board/Marvell/openrd/Kconfig b/board/Marvell/openrd/Kconfig
index 2dfed34..7032ba5 100644
--- a/board/Marvell/openrd/Kconfig
+++ b/board/Marvell/openrd/Kconfig
@@ -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"
diff --git a/board/Marvell/rd6281a/Kconfig b/board/Marvell/rd6281a/Kconfig
index ae753b0..e8702a7 100644
--- a/board/Marvell/rd6281a/Kconfig
+++ b/board/Marvell/rd6281a/Kconfig
@@ -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"
diff --git a/board/Marvell/sheevaplug/Kconfig b/board/Marvell/sheevaplug/Kconfig
index 6f3eb38..1c24d24 100644
--- a/board/Marvell/sheevaplug/Kconfig
+++ b/board/Marvell/sheevaplug/Kconfig
@@ -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"
diff --git a/board/Seagate/dockstar/Kconfig b/board/Seagate/dockstar/Kconfig
index 4696ac6..13ea620 100644
--- a/board/Seagate/dockstar/Kconfig
+++ b/board/Seagate/dockstar/Kconfig
@@ -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"
diff --git a/board/Seagate/goflexhome/Kconfig b/board/Seagate/goflexhome/Kconfig
index 0f918cb..2fb14ef 100644
--- a/board/Seagate/goflexhome/Kconfig
+++ b/board/Seagate/goflexhome/Kconfig
@@ -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"
diff --git a/board/buffalo/lsxl/Kconfig b/board/buffalo/lsxl/Kconfig
index 99f7b7c..50a620e 100644
--- a/board/buffalo/lsxl/Kconfig
+++ b/board/buffalo/lsxl/Kconfig
@@ -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"
diff --git a/board/cloudengines/pogo_e02/Kconfig b/board/cloudengines/pogo_e02/Kconfig
index 149a1a2..fe36314 100644
--- a/board/cloudengines/pogo_e02/Kconfig
+++ b/board/cloudengines/pogo_e02/Kconfig
@@ -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"
diff --git a/board/d-link/dns325/Kconfig b/board/d-link/dns325/Kconfig
index dea6071..763f93c 100644
--- a/board/d-link/dns325/Kconfig
+++ b/board/d-link/dns325/Kconfig
@@ -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"
diff --git a/board/iomega/iconnect/Kconfig b/board/iomega/iconnect/Kconfig
index 8ac21d2..f75c06b 100644
--- a/board/iomega/iconnect/Kconfig
+++ b/board/iomega/iconnect/Kconfig
@@ -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"
diff --git a/board/karo/tk71/Kconfig b/board/karo/tk71/Kconfig
index 546491b..24071f6 100644
--- a/board/karo/tk71/Kconfig
+++ b/board/karo/tk71/Kconfig
@@ -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"
diff --git a/board/keymile/km_arm/Kconfig b/board/keymile/km_arm/Kconfig
index dec4626..3e9cddb 100644
--- a/board/keymile/km_arm/Kconfig
+++ b/board/keymile/km_arm/Kconfig
@@ -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"
diff --git a/board/raidsonic/ib62x0/Kconfig b/board/raidsonic/ib62x0/Kconfig
index 1e667c4..c0c3a93 100644
--- a/board/raidsonic/ib62x0/Kconfig
+++ b/board/raidsonic/ib62x0/Kconfig
@@ -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"
diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index e53aed7..c459f4d 100644
--- a/configs/d2net_v2_defconfig
+++ b/configs/d2net_v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="D2NET_V2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_NET2BIG_V2=y
diff --git a/configs/dns325_defconfig b/configs/dns325_defconfig
index 6a18d2a..cc4a03b 100644
--- a/configs/dns325_defconfig
+++ b/configs/dns325_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_DNS325=y
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig
index 528669e..b773cde 100644
--- a/configs/dockstar_defconfig
+++ b/configs/dockstar_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_DOCKSTAR=y
diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 49de210..45113c8 100644
--- a/configs/dreamplug_defconfig
+++ b/configs/dreamplug_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_DREAMPLUG=y
diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig
index 10fde53..276489b 100644
--- a/configs/goflexhome_defconfig
+++ b/configs/goflexhome_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_GOFLEXHOME=y
diff --git a/configs/guruplug_defconfig b/configs/guruplug_defconfig
index f5be577..912a089 100644
--- a/configs/guruplug_defconfig
+++ b/configs/guruplug_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_GURUPLUG=y
diff --git a/configs/ib62x0_defconfig b/configs/ib62x0_defconfig
index d92217e..b6780c5 100644
--- a/configs/ib62x0_defconfig
+++ b/configs/ib62x0_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_IB62X0=y
diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig
index ab83fa6..7ff8d67 100644
--- a/configs/iconnect_defconfig
+++ b/configs/iconnect_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_ICONNECT=y
diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 26d9932..1123b52 100644
--- a/configs/inetspace_v2_defconfig
+++ b/configs/inetspace_v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="INETSPACE_V2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index c51fbf3..6a263a6 100644
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/configs/km_kirkwood_128m16_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_128M16"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index 4f554f7..aff76e5 100644
--- a/configs/km_kirkwood_defconfig
+++ b/configs/km_kirkwood_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index abb42c9..13c70a7 100644
--- a/configs/km_kirkwood_pci_defconfig
+++ b/configs/km_kirkwood_pci_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_KIRKWOOD_PCI"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index 0378277..78057e4 100644
--- a/configs/kmcoge5un_defconfig
+++ b/configs/kmcoge5un_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_COGE5UN"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 46ddbcd..d125c52 100644
--- a/configs/kmnusa_defconfig
+++ b/configs/kmnusa_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_NUSA"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index 183b365..d40dfd9 100644
--- a/configs/kmsugp1_defconfig
+++ b/configs/kmsugp1_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_SUGP1"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 9434ef0..40d0993 100644
--- a/configs/kmsuv31_defconfig
+++ b/configs/kmsuv31_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_SUV31"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 330b4d7..8c02fb3 100644
--- a/configs/lschlv2_defconfig
+++ b/configs/lschlv2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="LSCHLV2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y
diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index e8cdf8a..86845d1 100644
--- a/configs/lsxhl_defconfig
+++ b/configs/lsxhl_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="LSXHL"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_LSXL=y
diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index bc1e2ba..da991aa 100644
--- a/configs/mgcoge3un_defconfig
+++ b/configs/mgcoge3un_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_MGCOGE3UN"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/mv88f6281gtw_ge_defconfig b/configs/mv88f6281gtw_ge_defconfig
index 4e26879..0650032 100644
--- a/configs/mv88f6281gtw_ge_defconfig
+++ b/configs/mv88f6281gtw_ge_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_MV88F6281GTW_GE=y
diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index bffea60..7422fbe 100644
--- a/configs/net2big_v2_defconfig
+++ b/configs/net2big_v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="NET2BIG_V2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_NET2BIG_V2=y
diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index b262152..6a3a32f 100644
--- a/configs/netspace_lite_v2_defconfig
+++ b/configs/netspace_lite_v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_LITE_V2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index 4fc84fc..903d6c9 100644
--- a/configs/netspace_max_v2_defconfig
+++ b/configs/netspace_max_v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MAX_V2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 631a31b..774faa7 100644
--- a/configs/netspace_mini_v2_defconfig
+++ b/configs/netspace_mini_v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_MINI_V2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index dd77bfe..776fc04 100644
--- a/configs/netspace_v2_defconfig
+++ b/configs/netspace_v2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="NETSPACE_V2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_NETSPACE_V2=y
diff --git a/configs/openrd_base_defconfig b/configs/openrd_base_defconfig
index 25f777e..7b3ea99 100644
--- a/configs/openrd_base_defconfig
+++ b/configs/openrd_base_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_BASE"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
diff --git a/configs/openrd_client_defconfig b/configs/openrd_client_defconfig
index ba71851..d34793d 100644
--- a/configs/openrd_client_defconfig
+++ b/configs/openrd_client_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_CLIENT"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
diff --git a/configs/openrd_ultimate_defconfig b/configs/openrd_ultimate_defconfig
index 8651f92..4e10d4d 100644
--- a/configs/openrd_ultimate_defconfig
+++ b/configs/openrd_ultimate_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="BOARD_IS_OPENRD_ULTIMATE"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_OPENRD=y
diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig
index 41637e0..97effef 100644
--- a/configs/pogo_e02_defconfig
+++ b/configs/pogo_e02_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_POGO_E02=y
diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 6df18e9..1895c80 100644
--- a/configs/portl2_defconfig
+++ b/configs/portl2_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="KM_PORTL2"
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_KM_KIRKWOOD=y
diff --git a/configs/rd6281a_defconfig b/configs/rd6281a_defconfig
index d9c3e39..ed083bf 100644
--- a/configs/rd6281a_defconfig
+++ b/configs/rd6281a_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_RD6281A=y
diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig
index 9e4b9c9..d22b006 100644
--- a/configs/sheevaplug_defconfig
+++ b/configs/sheevaplug_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_SHEEVAPLUG=y
diff --git a/configs/tk71_defconfig b/configs/tk71_defconfig
index ffff874..411e3c1 100644
--- a/configs/tk71_defconfig
+++ b/configs/tk71_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_TK71=y
diff --git a/configs/wireless_space_defconfig b/configs/wireless_space_defconfig
index 6c78548..580e5ce 100644
--- a/configs/wireless_space_defconfig
+++ b/configs/wireless_space_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_KIRKWOOD=y
CONFIG_TARGET_WIRELESS_SPACE=y
diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 96db44f..eaf8c85 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -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 */
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index d66bd2a..46a42b3 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -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 */
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index b1ca859..981233a 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -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 */
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index 30a5859..5ed9497 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -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 */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index e401e7e..a56a4cb 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.h
@@ -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 */
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 186fd35..f4c748a 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -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 */
diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index a58f076..9f4a4b8 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -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 */
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 6d77680..d31e674 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -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 */
diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index 2d2e23a..9ac5d33 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -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
diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index f5f4961..bf5c1a1 100644
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -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 */
diff --git a/include/configs/mv88f6281gtw_ge.h b/include/configs/mv88f6281gtw_ge.h
index f6c06ee..311fc0c 100644
--- a/include/configs/mv88f6281gtw_ge.h
+++ b/include/configs/mv88f6281gtw_ge.h
@@ -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 */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index 8fab6e6..6efc4c3 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.h
@@ -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 */
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index a81d452..7594bdb 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -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 */
diff --git a/include/configs/rd6281a.h b/include/configs/rd6281a.h
index 9856516..e80949e 100644
--- a/include/configs/rd6281a.h
+++ b/include/configs/rd6281a.h
@@ -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 */
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index ecc93bc..dd984ee 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.h
@@ -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 */
diff --git a/include/configs/tk71.h b/include/configs/tk71.h
index 16e8a7f..a9c6d2e 100644
--- a/include/configs/tk71.h
+++ b/include/configs/tk71.h
@@ -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
diff --git a/include/configs/wireless_space.h b/include/configs/wireless_space.h
index 2070a9b..036c1e4 100644
--- a/include/configs/wireless_space.h
+++ b/include/configs/wireless_space.h
@@ -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 */
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig
2014-08-06 3:17 ` [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig Masahiro Yamada
@ 2014-08-06 10:05 ` Prafulla Wadaskar
2014-08-06 10:09 ` Prafulla Wadaskar
0 siblings, 1 reply; 37+ messages in thread
From: Prafulla Wadaskar @ 2014-08-06 10:05 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: Masahiro Yamada
> [mailto:yamada.m at jp.panasonic.com]
> Sent: 06 August 2014 08:48
> To: u-boot at lists.denx.de
> Cc: Tom Rini; Simon Glass; Masahiro Yamada; Prafulla
> Wadaskar; Luka Perkov
> Subject: [PATCH v2 06/15] kirkwood: kconfig: refactor
> Kconfig and defconfig
>
> 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").
>
> Signed-off-by: Masahiro Yamada
> <yamada.m@jp.panasonic.com>
> Cc: Prafulla Wadaskar <prafulla@marvell.com>
> Cc: Luka Perkov <luka@openwrt.org>
> ---
>
> Changes in v2:
> - Fix some board names pointed out by Luka Perkov.
>
> 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(-)
Acked-by: Prafulla Wadasdkar <prafulla@marvell.com>
Will be pulled latter...
Regards...
Prafulla . . .
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig
2014-08-06 10:05 ` Prafulla Wadaskar
@ 2014-08-06 10:09 ` Prafulla Wadaskar
2014-08-20 10:14 ` Albert ARIBAUD
0 siblings, 1 reply; 37+ messages in thread
From: Prafulla Wadaskar @ 2014-08-06 10:09 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> bounces at lists.denx.de] On Behalf Of Prafulla Wadaskar
> Sent: 06 August 2014 15:35
> To: Masahiro Yamada; u-boot at lists.denx.de
> Cc: Tom Rini; Luka Perkov
> Subject: Re: [U-Boot] [PATCH v2 06/15] kirkwood:
> kconfig: refactor Kconfig and defconfig
>
>
>
> > -----Original Message-----
> > From: Masahiro Yamada
> > [mailto:yamada.m at jp.panasonic.com]
> > Sent: 06 August 2014 08:48
> > To: u-boot at lists.denx.de
> > Cc: Tom Rini; Simon Glass; Masahiro Yamada; Prafulla
> > Wadaskar; Luka Perkov
> > Subject: [PATCH v2 06/15] kirkwood: kconfig: refactor
> > Kconfig and defconfig
> >
> > 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").
> >
> > Signed-off-by: Masahiro Yamada
> > <yamada.m@jp.panasonic.com>
> > Cc: Prafulla Wadaskar <prafulla@marvell.com>
> > Cc: Luka Perkov <luka@openwrt.org>
> > ---
> >
> > Changes in v2:
> > - Fix some board names pointed out by Luka Perkov.
> >
> > 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(-
> )
>
> Acked-by: Prafulla Wadasdkar <prafulla@marvell.com>
>
> Will be pulled latter...
>
Sorry ... Just consider ack, I think this entire patch series will be pulled by u-boot ARM custodian.
(if I am not wrong).
Regards...
Prafulla . . .
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig
2014-08-06 10:09 ` Prafulla Wadaskar
@ 2014-08-20 10:14 ` Albert ARIBAUD
0 siblings, 0 replies; 37+ messages in thread
From: Albert ARIBAUD @ 2014-08-20 10:14 UTC (permalink / raw)
To: u-boot
Hi Prafulla,
On Wed, 6 Aug 2014 03:09:25 -0700, Prafulla Wadaskar
<prafulla@marvell.com> wrote:
>
>
> > -----Original Message-----
> > From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> > bounces at lists.denx.de] On Behalf Of Prafulla Wadaskar
> > Sent: 06 August 2014 15:35
> > To: Masahiro Yamada; u-boot at lists.denx.de
> > Cc: Tom Rini; Luka Perkov
> > Subject: Re: [U-Boot] [PATCH v2 06/15] kirkwood:
> > kconfig: refactor Kconfig and defconfig
> >
> >
> >
> > > -----Original Message-----
> > > From: Masahiro Yamada
> > > [mailto:yamada.m at jp.panasonic.com]
> > > Sent: 06 August 2014 08:48
> > > To: u-boot at lists.denx.de
> > > Cc: Tom Rini; Simon Glass; Masahiro Yamada; Prafulla
> > > Wadaskar; Luka Perkov
> > > Subject: [PATCH v2 06/15] kirkwood: kconfig: refactor
> > > Kconfig and defconfig
> > >
> > > 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").
> > >
> > > Signed-off-by: Masahiro Yamada
> > > <yamada.m@jp.panasonic.com>
> > > Cc: Prafulla Wadaskar <prafulla@marvell.com>
> > > Cc: Luka Perkov <luka@openwrt.org>
> > > ---
> > >
> > > Changes in v2:
> > > - Fix some board names pointed out by Luka Perkov.
> > >
> > > 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(-
> > )
> >
> > Acked-by: Prafulla Wadasdkar <prafulla@marvell.com>
> >
> > Will be pulled latter...
> >
>
> Sorry ... Just consider ack, I think this entire patch series will be pulled by u-boot ARM custodian.
> (if I am not wrong).
Agreed -- no sense in scattering these changes across many ARM repos.
> Regards...
> Prafulla . . .
Amicalement,
--
Albert.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (5 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 06/15] kirkwood: kconfig: refactor Kconfig and defconfig Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-12 2:43 ` Minkyu Kang
2014-08-06 3:17 ` [U-Boot] [PATCH v2 08/15] davinci: " Masahiro Yamada
` (8 subsequent siblings)
15 siblings, 1 reply; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 43d0ce5..e3b49bb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
new file mode 100644
index 0000000..f1cacdc
--- /dev/null
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -0,0 +1,55 @@
+if ARCH_EXYNOS
+
+choice
+ prompt "EXYNOS board select"
+
+config TARGET_SMDKV310
+ bool "Exynos4210 SMDKV310 board"
+
+config TARGET_TRATS
+ bool "Exynos4210 Trats board"
+
+config TARGET_S5PC210_UNIVERSAL
+ bool "EXYNOS4210 Universal C210 board"
+
+config TARGET_ORIGEN
+ bool "Exynos4412 Origen board"
+
+config TARGET_TRATS2
+ bool "Exynos4412 Trat2 board"
+
+config TARGET_ARNDALE
+ bool "Exynos5250 Arndale board"
+
+config TARGET_SMDK5250
+ bool "SMDK5250 board"
+
+config TARGET_SNOW
+ bool "Snow board"
+
+config TARGET_SMDK5420
+ bool "SMDK5420 board"
+
+config TARGET_PEACH_PIT
+ bool "Peach Pi board"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "armv7"
+
+config SYS_SOC
+ string
+ default "exynos"
+
+source "board/samsung/smdkv310/Kconfig"
+source "board/samsung/trats/Kconfig"
+source "board/samsung/universal_c210/Kconfig"
+source "board/samsung/origen/Kconfig"
+source "board/samsung/trats2/Kconfig"
+source "board/samsung/arndale/Kconfig"
+source "board/samsung/smdk5250/Kconfig"
+source "board/samsung/smdk5420/Kconfig"
+
+endif
diff --git a/board/samsung/arndale/Kconfig b/board/samsung/arndale/Kconfig
index c3af0ec..5fdbacb 100644
--- a/board/samsung/arndale/Kconfig
+++ b/board/samsung/arndale/Kconfig
@@ -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"
diff --git a/board/samsung/origen/Kconfig b/board/samsung/origen/Kconfig
index f52de83..3eda350 100644
--- a/board/samsung/origen/Kconfig
+++ b/board/samsung/origen/Kconfig
@@ -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"
diff --git a/board/samsung/smdk5250/Kconfig b/board/samsung/smdk5250/Kconfig
index edebbde..e7036f5 100644
--- a/board/samsung/smdk5250/Kconfig
+++ b/board/samsung/smdk5250/Kconfig
@@ -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"
diff --git a/board/samsung/smdk5420/Kconfig b/board/samsung/smdk5420/Kconfig
index 052c275..fb9bedd 100644
--- a/board/samsung/smdk5420/Kconfig
+++ b/board/samsung/smdk5420/Kconfig
@@ -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"
diff --git a/board/samsung/smdkv310/Kconfig b/board/samsung/smdkv310/Kconfig
index e467092..785fae2 100644
--- a/board/samsung/smdkv310/Kconfig
+++ b/board/samsung/smdkv310/Kconfig
@@ -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"
diff --git a/board/samsung/trats/Kconfig b/board/samsung/trats/Kconfig
index 040413e..8bfb12d 100644
--- a/board/samsung/trats/Kconfig
+++ b/board/samsung/trats/Kconfig
@@ -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"
diff --git a/board/samsung/trats2/Kconfig b/board/samsung/trats2/Kconfig
index a82fdfb..f359c03 100644
--- a/board/samsung/trats2/Kconfig
+++ b/board/samsung/trats2/Kconfig
@@ -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"
diff --git a/board/samsung/universal_c210/Kconfig b/board/samsung/universal_c210/Kconfig
index 082168f..72b879a 100644
--- a/board/samsung/universal_c210/Kconfig
+++ b/board/samsung/universal_c210/Kconfig
@@ -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"
diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig
index 7cc4307..7ea5c0d 100644
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_ARNDALE=y
diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index e0d10d3..aa92381 100644
--- a/configs/origen_defconfig
+++ b/configs/origen_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_ORIGEN=y
diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 68ba794..797d5e0 100644
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_PEACH_PIT=y
diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 572df1d..a9a3446 100644
--- a/configs/s5pc210_universal_defconfig
+++ b/configs/s5pc210_universal_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_S5PC210_UNIVERSAL=y
diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index a35e4fc..465a75a 100644
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SMDK5250=y
diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 12933f0..9dc43f2 100644
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SMDK5420=y
diff --git a/configs/smdkv310_defconfig b/configs/smdkv310_defconfig
index d87986a..44da273 100644
--- a/configs/smdkv310_defconfig
+++ b/configs/smdkv310_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SMDKV310=y
diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 44c4701..2d59046 100644
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_EXYNOS=y
+S:CONFIG_TARGET_SNOW=y
diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 0a53f09..fa82724 100644
--- a/configs/trats2_defconfig
+++ b/configs/trats2_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS2=y
diff --git a/configs/trats_defconfig b/configs/trats_defconfig
index 93b94c0..f888a51 100644
--- a/configs/trats_defconfig
+++ b/configs/trats_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_EXYNOS=y
CONFIG_TARGET_TRATS=y
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-06 3:17 ` [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings Masahiro Yamada
@ 2014-08-12 2:43 ` Minkyu Kang
2014-08-22 8:16 ` Lukasz Majewski
0 siblings, 1 reply; 37+ messages in thread
From: Minkyu Kang @ 2014-08-12 2:43 UTC (permalink / raw)
To: u-boot
On 06/08/14 12:17, Masahiro Yamada wrote:
> 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").
>
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> ---
>
> Changes in v2: None
>
> 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
>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>
Thanks,
Minkyu Kang.
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-12 2:43 ` Minkyu Kang
@ 2014-08-22 8:16 ` Lukasz Majewski
2014-08-22 8:24 ` Masahiro Yamada
0 siblings, 1 reply; 37+ messages in thread
From: Lukasz Majewski @ 2014-08-22 8:16 UTC (permalink / raw)
To: u-boot
Dear All,
> On 06/08/14 12:17, Masahiro Yamada wrote:
> > 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").
> >
> > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > Cc: Minkyu Kang <mk7.kang@samsung.com>
> > ---
> >
> > Changes in v2: None
> >
> > 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
> >
>
> Acked-by: Minkyu Kang <mk7.kang@samsung.com>
>
> Thanks,
> Minkyu Kang.
Is there any chance that this patch set will be pulled to mainline in a
near future?
Some urgent work depends on it :-)
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-22 8:16 ` Lukasz Majewski
@ 2014-08-22 8:24 ` Masahiro Yamada
2014-08-22 8:27 ` Lukasz Majewski
2014-08-28 19:53 ` Tom Rini
0 siblings, 2 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-22 8:24 UTC (permalink / raw)
To: u-boot
On Fri, 22 Aug 2014 10:16:35 +0200
Lukasz Majewski <l.majewski@samsung.com> wrote:
> Dear All,
>
> > On 06/08/14 12:17, Masahiro Yamada wrote:
> > > 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").
> > >
> > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > > Cc: Minkyu Kang <mk7.kang@samsung.com>
> > > ---
> > >
> > > Changes in v2: None
> > >
> > > 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
> > >
> >
> > Acked-by: Minkyu Kang <mk7.kang@samsung.com>
> >
> > Thanks,
> > Minkyu Kang.
>
> Is there any chance that this patch set will be pulled to mainline in a
> near future?
>
> Some urgent work depends on it :-)
>
I am also worried about this.
Already new boards here and there, which lead to big conflicts.
Tom? Albert?
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-22 8:24 ` Masahiro Yamada
@ 2014-08-22 8:27 ` Lukasz Majewski
2014-08-28 19:53 ` Tom Rini
1 sibling, 0 replies; 37+ messages in thread
From: Lukasz Majewski @ 2014-08-22 8:27 UTC (permalink / raw)
To: u-boot
Hi Masahiro,
>
> On Fri, 22 Aug 2014 10:16:35 +0200
> Lukasz Majewski <l.majewski@samsung.com> wrote:
>
> > Dear All,
> >
> > > On 06/08/14 12:17, Masahiro Yamada wrote:
> > > > 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").
> > > >
> > > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > > > Cc: Minkyu Kang <mk7.kang@samsung.com>
> > > > ---
> > > >
> > > > Changes in v2: None
> > > >
> > > > 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
> > > >
> > >
> > > Acked-by: Minkyu Kang <mk7.kang@samsung.com>
> > >
> > > Thanks,
> > > Minkyu Kang.
> >
> > Is there any chance that this patch set will be pulled to mainline
> > in a near future?
> >
> > Some urgent work depends on it :-)
> >
>
> I am also worried about this.
> Already new boards here and there, which lead to big conflicts.
More we wait - then more work is then needed to fix this ...
>
>
> Tom? Albert?
>
>
> Best Regards
> Masahiro Yamada
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-22 8:24 ` Masahiro Yamada
2014-08-22 8:27 ` Lukasz Majewski
@ 2014-08-28 19:53 ` Tom Rini
2014-08-29 2:57 ` Masahiro Yamada
1 sibling, 1 reply; 37+ messages in thread
From: Tom Rini @ 2014-08-28 19:53 UTC (permalink / raw)
To: u-boot
On Fri, Aug 22, 2014 at 05:24:53PM +0900, Masahiro Yamada wrote:
>
> On Fri, 22 Aug 2014 10:16:35 +0200
> Lukasz Majewski <l.majewski@samsung.com> wrote:
>
> > Dear All,
> >
> > > On 06/08/14 12:17, Masahiro Yamada wrote:
> > > > 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").
> > > >
> > > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> > > > Cc: Minkyu Kang <mk7.kang@samsung.com>
> > > > ---
> > > >
> > > > Changes in v2: None
> > > >
> > > > 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
> > > >
> > >
> > > Acked-by: Minkyu Kang <mk7.kang@samsung.com>
> > >
> > > Thanks,
> > > Minkyu Kang.
> >
> > Is there any chance that this patch set will be pulled to mainline in a
> > near future?
> >
> > Some urgent work depends on it :-)
> >
>
> I am also worried about this.
> Already new boards here and there, which lead to big conflicts.
>
>
> Tom? Albert?
With my latest push to master can you please re-generate this series and
I'll pick it up quickly after? Thanks!
--
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/20140828/9469571b/attachment.pgp>
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-28 19:53 ` Tom Rini
@ 2014-08-29 2:57 ` Masahiro Yamada
2014-08-29 14:38 ` Tom Rini
0 siblings, 1 reply; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-29 2:57 UTC (permalink / raw)
To: u-boot
Hi Tom,
On Thu, 28 Aug 2014 15:53:28 -0400
Tom Rini <trini@ti.com> wrote:
> > > > Thanks,
> > > > Minkyu Kang.
> > >
> > > Is there any chance that this patch set will be pulled to mainline in a
> > > near future?
> > >
> > > Some urgent work depends on it :-)
> > >
> >
> > I am also worried about this.
> > Already new boards here and there, which lead to big conflicts.
> >
> >
> > Tom? Albert?
>
> With my latest push to master can you please re-generate this series and
> I'll pick it up quickly after? Thanks!
>
I see some pull-reqs which had already been sent to Albert.
At least, I notice Tegra one (http://patchwork.ozlabs.org/patch/381725/)
should be merged in advance because it is trying to add
a new board "Colibri T30 board" and would cause a big conflict with my series.
So, would you clear up as many ARM pull-reqs as possible soon?
I will regenerate my series based on it quickly.
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings
2014-08-29 2:57 ` Masahiro Yamada
@ 2014-08-29 14:38 ` Tom Rini
0 siblings, 0 replies; 37+ messages in thread
From: Tom Rini @ 2014-08-29 14:38 UTC (permalink / raw)
To: u-boot
On Fri, Aug 29, 2014 at 11:57:57AM +0900, Masahiro Yamada wrote:
> Hi Tom,
>
>
> On Thu, 28 Aug 2014 15:53:28 -0400
> Tom Rini <trini@ti.com> wrote:
>
> > > > > Thanks,
> > > > > Minkyu Kang.
> > > >
> > > > Is there any chance that this patch set will be pulled to mainline in a
> > > > near future?
> > > >
> > > > Some urgent work depends on it :-)
> > > >
> > >
> > > I am also worried about this.
> > > Already new boards here and there, which lead to big conflicts.
> > >
> > >
> > > Tom? Albert?
> >
> > With my latest push to master can you please re-generate this series and
> > I'll pick it up quickly after? Thanks!
> >
>
>
> I see some pull-reqs which had already been sent to Albert.
>
> At least, I notice Tegra one (http://patchwork.ozlabs.org/patch/381725/)
> should be merged in advance because it is trying to add
> a new board "Colibri T30 board" and would cause a big conflict with my series.
>
>
> So, would you clear up as many ARM pull-reqs as possible soon?
>
> I will regenerate my series based on it quickly.
OK, agreed.
--
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/20140829/9b4862b7/attachment.pgp>
^ permalink raw reply [flat|nested] 37+ messages in thread
* [U-Boot] [PATCH v2 08/15] davinci: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (6 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 07/15] exynos: kconfig: move board select menu and common settings Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 09/15] omap3: " Masahiro Yamada
` (7 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e3b49bb..8b3b7f7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig
new file mode 100644
index 0000000..be1b0f9
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig
@@ -0,0 +1,79 @@
+if ARCH_DAVINCI
+
+choice
+ prompt "DaVinci board select"
+
+config TARGET_ENBW_CMC
+ bool "EnBW CMC board"
+
+config TARGET_IPAM390
+ bool "IPAM390 board"
+
+config TARGET_DA830EVM
+ bool "DA830 EVM board"
+
+config TARGET_DA850EVM
+ bool "DA850 EVM board"
+
+config TARGET_CAM_ENC_4XX
+ bool "CAM ENC 4xx board"
+
+config TARGET_HAWKBOARD
+ bool "Hawkboard"
+
+config TARGET_DAVINCI_DM355EVM
+ bool "DM355 EVM board"
+
+config TARGET_DAVINCI_DM355LEOPARD
+ bool "DM355 Leopard board"
+
+config TARGET_DAVINCI_DM365EVM
+ bool "DM365 EVM board"
+
+config TARGET_DAVINCI_DM6467EVM
+ bool "DM6467 EVM board"
+
+config TARGET_DAVINCI_DVEVM
+ bool "DVEVM board"
+
+config TARGET_EA20
+ bool "EA20 board"
+
+config TARGET_DAVINCI_SCHMOOGIE
+ bool "Schmoogie board"
+
+config TARGET_DAVINCI_SFFSDR
+ bool "SFFSDR board"
+
+config TARGET_DAVINCI_SONATA
+ bool "Sonata board"
+
+config TARGET_CALIMAIN
+ bool "Calimain board"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "arm926ejs"
+
+config SYS_SOC
+ string
+ default "davinci"
+
+source "board/enbw/enbw_cmc/Kconfig"
+source "board/ait/cam_enc_4xx/Kconfig"
+source "board/Barix/ipam390/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/omicron/calimain/Kconfig"
+
+endif
diff --git a/board/Barix/ipam390/Kconfig b/board/Barix/ipam390/Kconfig
index a8134479..588ee73 100644
--- a/board/Barix/ipam390/Kconfig
+++ b/board/Barix/ipam390/Kconfig
@@ -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"
diff --git a/board/ait/cam_enc_4xx/Kconfig b/board/ait/cam_enc_4xx/Kconfig
index d1f89df..2b88692 100644
--- a/board/ait/cam_enc_4xx/Kconfig
+++ b/board/ait/cam_enc_4xx/Kconfig
@@ -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"
diff --git a/board/davinci/da8xxevm/Kconfig b/board/davinci/da8xxevm/Kconfig
index 89f78d7..b123703 100644
--- a/board/davinci/da8xxevm/Kconfig
+++ b/board/davinci/da8xxevm/Kconfig
@@ -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"
diff --git a/board/davinci/dm355evm/Kconfig b/board/davinci/dm355evm/Kconfig
index 2dbb509..7490bc0 100644
--- a/board/davinci/dm355evm/Kconfig
+++ b/board/davinci/dm355evm/Kconfig
@@ -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"
diff --git a/board/davinci/dm355leopard/Kconfig b/board/davinci/dm355leopard/Kconfig
index 345704f..73a53ff 100644
--- a/board/davinci/dm355leopard/Kconfig
+++ b/board/davinci/dm355leopard/Kconfig
@@ -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"
diff --git a/board/davinci/dm365evm/Kconfig b/board/davinci/dm365evm/Kconfig
index d5f7ea2..266c6ee 100644
--- a/board/davinci/dm365evm/Kconfig
+++ b/board/davinci/dm365evm/Kconfig
@@ -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"
diff --git a/board/davinci/dm6467evm/Kconfig b/board/davinci/dm6467evm/Kconfig
index f7b225d..1c4d0f0 100644
--- a/board/davinci/dm6467evm/Kconfig
+++ b/board/davinci/dm6467evm/Kconfig
@@ -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"
diff --git a/board/davinci/dvevm/Kconfig b/board/davinci/dvevm/Kconfig
index 7a2d86b..e020f8d 100644
--- a/board/davinci/dvevm/Kconfig
+++ b/board/davinci/dvevm/Kconfig
@@ -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"
diff --git a/board/davinci/ea20/Kconfig b/board/davinci/ea20/Kconfig
index afab821..93950fd 100644
--- a/board/davinci/ea20/Kconfig
+++ b/board/davinci/ea20/Kconfig
@@ -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"
diff --git a/board/davinci/schmoogie/Kconfig b/board/davinci/schmoogie/Kconfig
index 45401e4..7aa459d 100644
--- a/board/davinci/schmoogie/Kconfig
+++ b/board/davinci/schmoogie/Kconfig
@@ -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"
diff --git a/board/davinci/sffsdr/Kconfig b/board/davinci/sffsdr/Kconfig
index aeb7ef2..95461fc 100644
--- a/board/davinci/sffsdr/Kconfig
+++ b/board/davinci/sffsdr/Kconfig
@@ -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"
diff --git a/board/davinci/sonata/Kconfig b/board/davinci/sonata/Kconfig
index 2cf5035..a21fb8e 100644
--- a/board/davinci/sonata/Kconfig
+++ b/board/davinci/sonata/Kconfig
@@ -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"
diff --git a/board/enbw/enbw_cmc/Kconfig b/board/enbw/enbw_cmc/Kconfig
index e061e7e..183334b 100644
--- a/board/enbw/enbw_cmc/Kconfig
+++ b/board/enbw/enbw_cmc/Kconfig
@@ -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"
diff --git a/board/omicron/calimain/Kconfig b/board/omicron/calimain/Kconfig
index 923af8a..46e95d8 100644
--- a/board/omicron/calimain/Kconfig
+++ b/board/omicron/calimain/Kconfig
@@ -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"
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index a808ddf..02d3912 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_CALIMAIN=y
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index 1417d83..dfdda82 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_CAM_ENC_4XX=y
diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
index 49e74c3..d27cdb0 100644
--- a/configs/da830evm_defconfig
+++ b/configs/da830evm_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DA830EVM=y
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index af419ce..a79a0a8 100644
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -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
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 7517e92..afdce5e 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -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
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index edc604a..25c303c 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -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
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index ef0b854..d3a03b2 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355EVM=y
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 22da9f3..875c0b5 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index dfae0b2..f841fd9 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM365EVM=y
diff --git a/configs/davinci_dm6467Tevm_defconfig b/configs/davinci_dm6467Tevm_defconfig
index e2c2de4..4523d4a 100644
--- a/configs/davinci_dm6467Tevm_defconfig
+++ b/configs/davinci_dm6467Tevm_defconfig
@@ -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
diff --git a/configs/davinci_dm6467evm_defconfig b/configs/davinci_dm6467evm_defconfig
index abd3491..5208257 100644
--- a/configs/davinci_dm6467evm_defconfig
+++ b/configs/davinci_dm6467evm_defconfig
@@ -1,3 +1,4 @@
CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DM6467EVM=y
diff --git a/configs/davinci_dvevm_defconfig b/configs/davinci_dvevm_defconfig
index eb53692..74e55b9 100644
--- a/configs/davinci_dvevm_defconfig
+++ b/configs/davinci_dvevm_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_DVEVM=y
diff --git a/configs/davinci_schmoogie_defconfig b/configs/davinci_schmoogie_defconfig
index bc166ab..64ed2c1 100644
--- a/configs/davinci_schmoogie_defconfig
+++ b/configs/davinci_schmoogie_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
diff --git a/configs/davinci_sffsdr_defconfig b/configs/davinci_sffsdr_defconfig
index ea9cf88..9eb0f07 100644
--- a/configs/davinci_sffsdr_defconfig
+++ b/configs/davinci_sffsdr_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SFFSDR=y
diff --git a/configs/davinci_sonata_defconfig b/configs/davinci_sonata_defconfig
index 2c9cd4f..d8f0f77 100644
--- a/configs/davinci_sonata_defconfig
+++ b/configs/davinci_sonata_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_DAVINCI_SONATA=y
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 562849d..93676cd 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_EA20=y
diff --git a/configs/enbw_cmc_defconfig b/configs/enbw_cmc_defconfig
index 7fe405a..92c4926 100644
--- a/configs/enbw_cmc_defconfig
+++ b/configs/enbw_cmc_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
CONFIG_TARGET_ENBW_CMC=y
diff --git a/configs/hawkboard_defconfig b/configs/hawkboard_defconfig
index 9945fe5..4084f9c 100644
--- a/configs/hawkboard_defconfig
+++ b/configs/hawkboard_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_HAWKBOARD=y
diff --git a/configs/hawkboard_uart_defconfig b/configs/hawkboard_uart_defconfig
index b4db291..d7eeae7 100644
--- a/configs/hawkboard_uart_defconfig
+++ b/configs/hawkboard_uart_defconfig
@@ -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
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index 6e95951..4fefcbe 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
+S:CONFIG_TARGET_IPAM390=y
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 09/15] omap3: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (7 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 08/15] davinci: " Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 10/15] omap4: " Masahiro Yamada
` (6 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Tom Rini <trini@ti.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 8b3b7f7..ee29e30 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
new file mode 100644
index 0000000..6578f0c
--- /dev/null
+++ b/arch/arm/cpu/armv7/omap3/Kconfig
@@ -0,0 +1,107 @@
+if OMAP34XX
+
+choice
+ prompt "OMAP3 board select"
+
+config TARGET_AM3517_EVM
+ bool "AM3517 EVM"
+
+config TARGET_MT_VENTOUX
+ bool "TeeJet Mt.Ventoux"
+
+config TARGET_OMAP3_SDP3430
+ bool "TI OMAP3430 SDP"
+
+config TARGET_OMAP3_BEAGLE
+ bool "TI OMAP3 BeagleBoard"
+
+config TARGET_CM_T35
+ bool "CompuLab CM-T35"
+
+config TARGET_DEVKIT8000
+ bool "TimLL OMAP3 Devkit8000"
+
+config TARGET_OMAP3_EVM
+ bool "TI OMAP3 EVM"
+
+config TARGET_OMAP3_EVM_QUICK_MMC
+ bool "TI OMAP3 EVM Quick MMC"
+
+config TARGET_OMAP3_EVM_QUICK_NAND
+ bool "TI OMAP3 EVM Quick NAND"
+
+config TARGET_OMAP3_IGEP00X0
+ bool "IGEP"
+
+config TARGET_OMAP3_OVERO
+ bool "OMAP35xx Gumstix Overo"
+
+config TARGET_OMAP3_ZOOM1
+ bool "TI Zoom1"
+
+config TARGET_AM3517_CRANE
+ bool "am3517_crane"
+
+config TARGET_OMAP3_PANDORA
+ bool "OMAP3 Pandora"
+
+config TARGET_ECO5PK
+ bool "ECO5PK"
+
+config TARGET_DIG297
+ bool "DIG297"
+
+config TARGET_TRICORDER
+ bool "Tricorder"
+
+config TARGET_MCX
+ bool "MCX"
+
+config TARGET_OMAP3_LOGIC
+ bool "OMAP3 Logic"
+
+config TARGET_OMAP3_MVBLX
+ bool "OMAP3 MVBLX"
+
+config TARGET_NOKIA_RX51
+ bool "Nokia RX51"
+
+config TARGET_TAO3530
+ bool "TAO3530"
+
+config TARGET_TWISTER
+ bool "Twister"
+
+endchoice
+
+config SYS_CPU
+ string
+ default "armv7"
+
+config SYS_SOC
+ string
+ default "omap3"
+
+source "board/logicpd/am3517evm/Kconfig"
+source "board/teejet/mt_ventoux/Kconfig"
+source "board/ti/sdp3430/Kconfig"
+source "board/ti/beagle/Kconfig"
+source "board/compulab/cm_t35/Kconfig"
+source "board/timll/devkit8000/Kconfig"
+source "board/ti/evm/Kconfig"
+source "board/isee/igep00x0/Kconfig"
+source "board/overo/Kconfig"
+source "board/logicpd/zoom1/Kconfig"
+source "board/ti/am3517crane/Kconfig"
+source "board/pandora/Kconfig"
+source "board/8dtech/eco5pk/Kconfig"
+source "board/comelit/dig297/Kconfig"
+source "board/corscience/tricorder/Kconfig"
+source "board/htkw/mcx/Kconfig"
+source "board/logicpd/omap3som/Kconfig"
+source "board/matrix_vision/mvblx/Kconfig"
+source "board/nokia/rx51/Kconfig"
+source "board/technexion/tao3530/Kconfig"
+source "board/technexion/twister/Kconfig"
+
+endif
diff --git a/board/8dtech/eco5pk/Kconfig b/board/8dtech/eco5pk/Kconfig
index fb1b308..0af1b30 100644
--- a/board/8dtech/eco5pk/Kconfig
+++ b/board/8dtech/eco5pk/Kconfig
@@ -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"
diff --git a/board/comelit/dig297/Kconfig b/board/comelit/dig297/Kconfig
index d7a2bf2..4c5ea09 100644
--- a/board/comelit/dig297/Kconfig
+++ b/board/comelit/dig297/Kconfig
@@ -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"
diff --git a/board/compulab/cm_t35/Kconfig b/board/compulab/cm_t35/Kconfig
index fd960bc..06de692 100644
--- a/board/compulab/cm_t35/Kconfig
+++ b/board/compulab/cm_t35/Kconfig
@@ -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"
diff --git a/board/corscience/tricorder/Kconfig b/board/corscience/tricorder/Kconfig
index a1e06e7..5147fd7 100644
--- a/board/corscience/tricorder/Kconfig
+++ b/board/corscience/tricorder/Kconfig
@@ -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"
diff --git a/board/htkw/mcx/Kconfig b/board/htkw/mcx/Kconfig
index 1e2c679..343ff4d 100644
--- a/board/htkw/mcx/Kconfig
+++ b/board/htkw/mcx/Kconfig
@@ -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"
diff --git a/board/isee/igep00x0/Kconfig b/board/isee/igep00x0/Kconfig
index c9f2969..c9352fd 100644
--- a/board/isee/igep00x0/Kconfig
+++ b/board/isee/igep00x0/Kconfig
@@ -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"
diff --git a/board/logicpd/am3517evm/Kconfig b/board/logicpd/am3517evm/Kconfig
index 9bc5ae5..1012d3d 100644
--- a/board/logicpd/am3517evm/Kconfig
+++ b/board/logicpd/am3517evm/Kconfig
@@ -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"
diff --git a/board/logicpd/omap3som/Kconfig b/board/logicpd/omap3som/Kconfig
index daaefa6..adeaf4d 100644
--- a/board/logicpd/omap3som/Kconfig
+++ b/board/logicpd/omap3som/Kconfig
@@ -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"
diff --git a/board/logicpd/zoom1/Kconfig b/board/logicpd/zoom1/Kconfig
index 3199130..e9a5623 100644
--- a/board/logicpd/zoom1/Kconfig
+++ b/board/logicpd/zoom1/Kconfig
@@ -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"
diff --git a/board/matrix_vision/mvblx/Kconfig b/board/matrix_vision/mvblx/Kconfig
index d89c1e3..69f0566 100644
--- a/board/matrix_vision/mvblx/Kconfig
+++ b/board/matrix_vision/mvblx/Kconfig
@@ -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"
diff --git a/board/nokia/rx51/Kconfig b/board/nokia/rx51/Kconfig
index 41d0daa..faa90d2 100644
--- a/board/nokia/rx51/Kconfig
+++ b/board/nokia/rx51/Kconfig
@@ -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"
diff --git a/board/overo/Kconfig b/board/overo/Kconfig
index 1d4a261..d1ea236 100644
--- a/board/overo/Kconfig
+++ b/board/overo/Kconfig
@@ -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"
diff --git a/board/pandora/Kconfig b/board/pandora/Kconfig
index a36c0c8..6f41005 100644
--- a/board/pandora/Kconfig
+++ b/board/pandora/Kconfig
@@ -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"
diff --git a/board/technexion/tao3530/Kconfig b/board/technexion/tao3530/Kconfig
index 06e56a4..910a9cd 100644
--- a/board/technexion/tao3530/Kconfig
+++ b/board/technexion/tao3530/Kconfig
@@ -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"
diff --git a/board/technexion/twister/Kconfig b/board/technexion/twister/Kconfig
index 1790f6d..e6f811a 100644
--- a/board/technexion/twister/Kconfig
+++ b/board/technexion/twister/Kconfig
@@ -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"
diff --git a/board/teejet/mt_ventoux/Kconfig b/board/teejet/mt_ventoux/Kconfig
index 96cf7c0..a567204 100644
--- a/board/teejet/mt_ventoux/Kconfig
+++ b/board/teejet/mt_ventoux/Kconfig
@@ -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"
diff --git a/board/ti/am3517crane/Kconfig b/board/ti/am3517crane/Kconfig
index fdb20ab..c44dab5 100644
--- a/board/ti/am3517crane/Kconfig
+++ b/board/ti/am3517crane/Kconfig
@@ -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"
diff --git a/board/ti/beagle/Kconfig b/board/ti/beagle/Kconfig
index 15dccdf..10c81c2 100644
--- a/board/ti/beagle/Kconfig
+++ b/board/ti/beagle/Kconfig
@@ -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"
diff --git a/board/ti/evm/Kconfig b/board/ti/evm/Kconfig
index e342942..c54ce33 100644
--- a/board/ti/evm/Kconfig
+++ b/board/ti/evm/Kconfig
@@ -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"
diff --git a/board/ti/sdp3430/Kconfig b/board/ti/sdp3430/Kconfig
index 81989b7..fcf7329 100644
--- a/board/ti/sdp3430/Kconfig
+++ b/board/ti/sdp3430/Kconfig
@@ -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"
diff --git a/board/timll/devkit8000/Kconfig b/board/timll/devkit8000/Kconfig
index d9c920c..d1603f4 100644
--- a/board/timll/devkit8000/Kconfig
+++ b/board/timll/devkit8000/Kconfig
@@ -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"
diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig
index ec93224..cf9d8c7 100644
--- a/configs/am3517_crane_defconfig
+++ b/configs/am3517_crane_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_AM3517_CRANE=y
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 1fab6c1..2336f1e 100644
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_AM3517_EVM=y
diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index 00b0590..2bb616f 100644
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_CM_T35=y
diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig
index 7c5d222..578ae74 100644
--- a/configs/devkit8000_defconfig
+++ b/configs/devkit8000_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_DEVKIT8000=y
diff --git a/configs/dig297_defconfig b/configs/dig297_defconfig
index 9309ac2..95bc353 100644
--- a/configs/dig297_defconfig
+++ b/configs/dig297_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_OMAP34XX=y
CONFIG_TARGET_DIG297=y
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig
index 79f3d5a..e45bdad 100644
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_ECO5PK=y
diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig
index e99f773..dd56ea1 100644
--- a/configs/igep0020_defconfig
+++ b/configs/igep0020_defconfig
@@ -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
diff --git a/configs/igep0020_nand_defconfig b/configs/igep0020_nand_defconfig
index baa4a0a..da54da0 100644
--- a/configs/igep0020_nand_defconfig
+++ b/configs/igep0020_nand_defconfig
@@ -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
diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig
index 5f404eb..1025fed 100644
--- a/configs/igep0030_defconfig
+++ b/configs/igep0030_defconfig
@@ -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
diff --git a/configs/igep0030_nand_defconfig b/configs/igep0030_nand_defconfig
index a43dfec..b3b3366 100644
--- a/configs/igep0030_nand_defconfig
+++ b/configs/igep0030_nand_defconfig
@@ -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
diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index c0d019c..faa04f7 100644
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -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
diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index a700c88..c2031f8 100644
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_MCX=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 0fcad87..a0678bb 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_MT_VENTOUX=y
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 055a602..e03f586 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_OMAP34XX=y
CONFIG_TARGET_NOKIA_RX51=y
diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index a37ca60..a3e4c2c 100644
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -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
diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig
index 284abe1..c749aa7 100644
--- a/configs/omap3_evm_defconfig
+++ b/configs/omap3_evm_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_OMAP3_EVM=y
diff --git a/configs/omap3_evm_quick_mmc_defconfig b/configs/omap3_evm_quick_mmc_defconfig
index 5bafeac..e89bb82 100644
--- a/configs/omap3_evm_quick_mmc_defconfig
+++ b/configs/omap3_evm_quick_mmc_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_OMAP3_EVM_QUICK_MMC=y
diff --git a/configs/omap3_evm_quick_nand_defconfig b/configs/omap3_evm_quick_nand_defconfig
index 501e46f..e70fddd 100644
--- a/configs/omap3_evm_quick_nand_defconfig
+++ b/configs/omap3_evm_quick_nand_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_OMAP3_EVM_QUICK_NAND=y
diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig
index a183fe7..50bffa9 100644
--- a/configs/omap3_ha_defconfig
+++ b/configs/omap3_ha_defconfig
@@ -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
diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 6278554..5f2c063 100644
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_LOGIC=y
diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig
index b7ddcc8..fb6edc2 100644
--- a/configs/omap3_mvblx_defconfig
+++ b/configs/omap3_mvblx_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_MVBLX=y
diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig
index dca3237..7e0d334 100644
--- a/configs/omap3_overo_defconfig
+++ b/configs/omap3_overo_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_OMAP3_OVERO=y
diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig
index 54dab48..bf28537 100644
--- a/configs/omap3_pandora_defconfig
+++ b/configs/omap3_pandora_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_PANDORA=y
diff --git a/configs/omap3_sdp3430_defconfig b/configs/omap3_sdp3430_defconfig
index 9672956..1172c2a 100644
--- a/configs/omap3_sdp3430_defconfig
+++ b/configs/omap3_sdp3430_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_SDP3430=y
diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index f4c8ed9..e2d0a8c 100644
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_OMAP34XX=y
CONFIG_TARGET_OMAP3_ZOOM1=y
diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig
index d8b57b1..a511389 100644
--- a/configs/tao3530_defconfig
+++ b/configs/tao3530_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_TAO3530=y
diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig
index 80c2df4..7ea5e02 100644
--- a/configs/tricorder_defconfig
+++ b/configs/tricorder_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_TRICORDER=y
diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig
index 6715e71..f6e1c46 100644
--- a/configs/tricorder_flash_defconfig
+++ b/configs/tricorder_flash_defconfig
@@ -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
diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 27e8364..9023736 100644
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP34XX=y
+S:CONFIG_TARGET_TWISTER=y
diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
index 898ed2e..fcb4033 100644
--- a/include/configs/am3517_crane.h
+++ b/include/configs/am3517_crane.h
@@ -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
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index 1e2d55b..c5d64ca 100644
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -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
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index c63608c..70df1eb 100644
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -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 */
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 69c51bc..7ab6d51 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -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
diff --git a/include/configs/dig297.h b/include/configs/dig297.h
index 7e47c56..c8739ed 100644
--- a/include/configs/dig297.h
+++ b/include/configs/dig297.h
@@ -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
diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index dff895a..cd85a6c 100644
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -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
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 43c1617..982b689 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -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 */
diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index eef4230..8885e17 100644
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -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
diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 717c935..aeb385f 100644
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -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
diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h
index a3dcb15..f3c21c4 100644
--- a/include/configs/omap3_mvblx.h
+++ b/include/configs/omap3_mvblx.h
@@ -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
diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h
index c22c1fc..45feeb5 100644
--- a/include/configs/omap3_pandora.h
+++ b/include/configs/omap3_pandora.h
@@ -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
diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h
index a3e8a59..ac307eb 100644
--- a/include/configs/omap3_sdp3430.h
+++ b/include/configs/omap3_sdp3430.h
@@ -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
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index e1fc754..c2ba0d1 100644
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -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
diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h
index 174bfe5..8d2db27 100644
--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@@ -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
diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index ade35d2..3b19d3d 100644
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -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>
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index cc0d172..6ddf3d5 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 10/15] omap4: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (8 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 09/15] omap3: " Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 3:17 ` [U-Boot] [PATCH v2 11/15] omap5: " Masahiro Yamada
` (5 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ee29e30..bad0c5d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/omap4/Kconfig b/arch/arm/cpu/armv7/omap4/Kconfig
new file mode 100644
index 0000000..20d2c11
--- /dev/null
+++ b/arch/arm/cpu/armv7/omap4/Kconfig
@@ -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
diff --git a/board/gumstix/duovero/Kconfig b/board/gumstix/duovero/Kconfig
index d1b5c66..f662798 100644
--- a/board/gumstix/duovero/Kconfig
+++ b/board/gumstix/duovero/Kconfig
@@ -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"
diff --git a/board/ti/panda/Kconfig b/board/ti/panda/Kconfig
index be1307d..b69218b 100644
--- a/board/ti/panda/Kconfig
+++ b/board/ti/panda/Kconfig
@@ -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"
diff --git a/board/ti/sdp4430/Kconfig b/board/ti/sdp4430/Kconfig
index 140e1f1..9c1d8fe 100644
--- a/board/ti/sdp4430/Kconfig
+++ b/board/ti/sdp4430/Kconfig
@@ -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"
diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig
index b56092a..8591845 100644
--- a/configs/duovero_defconfig
+++ b/configs/duovero_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP44XX=y
+S:CONFIG_TARGET_DUOVERO=y
diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index 1498d17..6afac38 100644
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP44XX=y
+S:CONFIG_TARGET_OMAP4_PANDA=y
diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig
index faac317..c771e76 100644
--- a/configs/omap4_sdp4430_defconfig
+++ b/configs/omap4_sdp4430_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP44XX=y
+S:CONFIG_TARGET_OMAP4_SDP4430=y
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
index 30b02f6..8c7310c 100644
--- a/include/configs/ti_omap4_common.h
+++ b/include/configs/ti_omap4_common.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 11/15] omap5: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (9 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 10/15] omap4: " Masahiro Yamada
@ 2014-08-06 3:17 ` Masahiro Yamada
2014-08-06 3:18 ` [U-Boot] [PATCH v2 12/15] keystone: " Masahiro Yamada
` (4 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:17 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index bad0c5d..fd8bc59 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig
new file mode 100644
index 0000000..be80393
--- /dev/null
+++ b/arch/arm/cpu/armv7/omap5/Kconfig
@@ -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
diff --git a/board/compulab/cm_t54/Kconfig b/board/compulab/cm_t54/Kconfig
index 0fe3692..0edab5c 100644
--- a/board/compulab/cm_t54/Kconfig
+++ b/board/compulab/cm_t54/Kconfig
@@ -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"
diff --git a/board/ti/dra7xx/Kconfig b/board/ti/dra7xx/Kconfig
index 4b13ef4..9ee13c5 100644
--- a/board/ti/dra7xx/Kconfig
+++ b/board/ti/dra7xx/Kconfig
@@ -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"
diff --git a/board/ti/omap5_uevm/Kconfig b/board/ti/omap5_uevm/Kconfig
index 7c7d5dc..3592e7b 100644
--- a/board/ti/omap5_uevm/Kconfig
+++ b/board/ti/omap5_uevm/Kconfig
@@ -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"
diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index b48a171..32efaa2 100644
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
+S:CONFIG_TARGET_CM_T54=y
diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 82cffd7..297c6b5 100644
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -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
diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig
index be09f40..92417f2 100644
--- a/configs/dra7xx_evm_qspiboot_defconfig
+++ b/configs/dra7xx_evm_qspiboot_defconfig
@@ -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
diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig
index e0d1e45..3551317 100644
--- a/configs/dra7xx_evm_uart3_defconfig
+++ b/configs/dra7xx_evm_uart3_defconfig
@@ -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
diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 7a19ce9..86d5c16 100644
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -1,3 +1,4 @@
CONFIG_SPL=y
+S:CONFIG_ARM=y
++S:CONFIG_OMAP54XX=y
+S:CONFIG_TARGET_OMAP5_UEVM=y
diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index cb928ab..3166392 100644
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 12/15] keystone: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (10 preceding siblings ...)
2014-08-06 3:17 ` [U-Boot] [PATCH v2 11/15] omap5: " Masahiro Yamada
@ 2014-08-06 3:18 ` Masahiro Yamada
2014-08-06 3:18 ` [U-Boot] [PATCH v2 13/15] orion5x: " Masahiro Yamada
` (3 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:18 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Vitaly Andrianov <vitalya@ti.com>
Reviewed-by: Tom Rini <trini@ti.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fd8bc59..2e8cd2a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/armv7/keystone/Kconfig b/arch/arm/cpu/armv7/keystone/Kconfig
new file mode 100644
index 0000000..24d0cbe
--- /dev/null
+++ b/arch/arm/cpu/armv7/keystone/Kconfig
@@ -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
diff --git a/board/ti/ks2_evm/Kconfig b/board/ti/ks2_evm/Kconfig
index 7890b30..3108782 100644
--- a/board/ti/ks2_evm/Kconfig
+++ b/board/ti/ks2_evm/Kconfig
@@ -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"
diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig
index c210ad5..be8d2ee 100644
--- a/configs/k2e_evm_defconfig
+++ b/configs/k2e_evm_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2E_EVM=y
diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig
index caa763a..eee3335 100644
--- a/configs/k2hk_evm_defconfig
+++ b/configs/k2hk_evm_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ARCH_KEYSTONE=y
CONFIG_TARGET_K2HK_EVM=y
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 13/15] orion5x: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (11 preceding siblings ...)
2014-08-06 3:18 ` [U-Boot] [PATCH v2 12/15] keystone: " Masahiro Yamada
@ 2014-08-06 3:18 ` Masahiro Yamada
2014-08-06 3:18 ` [U-Boot] [PATCH v2 14/15] highbank: kconfig: move " Masahiro Yamada
` (2 subsequent siblings)
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:18 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2e8cd2a..74a4e4b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/arm926ejs/orion5x/Kconfig b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
new file mode 100644
index 0000000..aa40099
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/orion5x/Kconfig
@@ -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
diff --git a/board/LaCie/edminiv2/Kconfig b/board/LaCie/edminiv2/Kconfig
index f1151d1..9675a9e 100644
--- a/board/LaCie/edminiv2/Kconfig
+++ b/board/LaCie/edminiv2/Kconfig
@@ -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"
diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index 82aa684..3b1a6c1 100644
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
+CONFIG_ORION5X=y
CONFIG_TARGET_EDMINIV2=y
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 77717a8..1df4fc1 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -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 */
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 14/15] highbank: kconfig: move common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (12 preceding siblings ...)
2014-08-06 3:18 ` [U-Boot] [PATCH v2 13/15] orion5x: " Masahiro Yamada
@ 2014-08-06 3:18 ` Masahiro Yamada
2014-08-06 3:18 ` [U-Boot] [PATCH v2 15/15] nomadik: kconfig: move board select menu and " Masahiro Yamada
2014-08-09 8:00 ` [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro YAMADA
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:18 UTC (permalink / raw)
To: u-boot
Move Highbank-specific settings to highbank/Kconfig.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Rob Herring <robh@kernel.org>
---
Changes in v2: None
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%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 74a4e4b..3ffadb6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/board/highbank/Kconfig b/arch/arm/cpu/armv7/highbank/Kconfig
similarity index 90%
rename from board/highbank/Kconfig
rename to arch/arm/cpu/armv7/highbank/Kconfig
index 1c32490..9527928 100644
--- a/board/highbank/Kconfig
+++ b/arch/arm/cpu/armv7/highbank/Kconfig
@@ -1,4 +1,4 @@
-if TARGET_HIGHBANK
+if ARCH_HIGHBANK
config SYS_CPU
string
diff --git a/configs/highbank_defconfig b/configs/highbank_defconfig
index 23fd52d..88efbdf 100644
--- a/configs/highbank_defconfig
+++ b/configs/highbank_defconfig
@@ -1,2 +1,2 @@
CONFIG_ARM=y
-CONFIG_TARGET_HIGHBANK=y
+CONFIG_ARCH_HIGHBANK=y
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 15/15] nomadik: kconfig: move board select menu and common settings
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (13 preceding siblings ...)
2014-08-06 3:18 ` [U-Boot] [PATCH v2 14/15] highbank: kconfig: move " Masahiro Yamada
@ 2014-08-06 3:18 ` Masahiro Yamada
2014-08-09 8:00 ` [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro YAMADA
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro Yamada @ 2014-08-06 3:18 UTC (permalink / raw)
To: u-boot
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").
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Changes in v2: None
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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3ffadb6..54e78cc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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"
diff --git a/arch/arm/cpu/arm926ejs/nomadik/Kconfig b/arch/arm/cpu/arm926ejs/nomadik/Kconfig
new file mode 100644
index 0000000..7177800
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/nomadik/Kconfig
@@ -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
diff --git a/board/st/nhk8815/Kconfig b/board/st/nhk8815/Kconfig
index ec3f880..ba2e7c2 100644
--- a/board/st/nhk8815/Kconfig
+++ b/board/st/nhk8815/Kconfig
@@ -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"
diff --git a/configs/nhk8815_defconfig b/configs/nhk8815_defconfig
index 3d20199..f661226 100644
--- a/configs/nhk8815_defconfig
+++ b/configs/nhk8815_defconfig
@@ -1,2 +1,3 @@
CONFIG_ARM=y
-CONFIG_TARGET_NHK8815=y
+CONFIG_ARCH_NOMADIK=y
+CONFIG_NOMADIK_NHK8815=y
diff --git a/configs/nhk8815_onenand_defconfig b/configs/nhk8815_onenand_defconfig
index 860ae92..dd8048d 100644
--- a/configs/nhk8815_onenand_defconfig
+++ b/configs/nhk8815_onenand_defconfig
@@ -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
diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h
index 4d3428c..5419f55 100644
--- a/include/configs/nhk8815.h
+++ b/include/configs/nhk8815.h
@@ -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 */
--
1.9.1
^ permalink raw reply related [flat|nested] 37+ messages in thread* [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir
2014-08-06 3:17 [U-Boot] [PATCH v2 0/15] arm: kconfig: move board select menus and other settings to SoC dir Masahiro Yamada
` (14 preceding siblings ...)
2014-08-06 3:18 ` [U-Boot] [PATCH v2 15/15] nomadik: kconfig: move board select menu and " Masahiro Yamada
@ 2014-08-09 8:00 ` Masahiro YAMADA
15 siblings, 0 replies; 37+ messages in thread
From: Masahiro YAMADA @ 2014-08-09 8:00 UTC (permalink / raw)
To: u-boot
Hi Tom,
2014-08-06 12:17 GMT+09:00 Masahiro Yamada <yamada.m@jp.panasonic.com>:
> 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 binaries are
> produced with/without thie series.
>
> I am including a patch to remove "omap5912osk" board in this series
> to avoid conflicts.
>
> Prerequisites
> -------------
> [1]
> http://patchwork.ozlabs.org/patch/374758/
> to avoid a conflict in drivers/usb/gadget/Makefile
>
> [2]
> http://patchwork.ozlabs.org/patch/374416/
> to avoid a conflict in doc/README.scrapyard
>
> [3]
> http://patchwork.ozlabs.org/patch/375467/
> to avoid a conflict in configs/jetson-tk1_defconfig
>
New boards are coming all the time, for example
http://patchwork.ozlabs.org/patch/376782/
The problem is this series causes big conflicts with such patches.
Because this series was reviewed, acked or tested by some ARM-SoC maintainers,
I think this should go directly into u-boot/master asap along with
some prerequisites.
What do you think? Should we wait for Albert's review?
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 37+ messages in thread