Convert CONFIG_AM335X_USB0 et al to Kconfig
PATCH 1/8 Convert CONFIG_AM335X_USB0 et al to Kconfig
This converts the following to Kconfig:
CONFIG_AM335X_USB0
CONFIG_AM335X_USB0_MODE
CONFIG_AM335X_USB1
CONFIG_AM335X_USB1_MODE
We do this by introducing specific options for static configuration of USB0/USB1 in SPL rather than defining CONFIG_AM335X_USBx_MODE to the enum value being used. Furthermore, with how the code is used now we do not need to have OTG mode exposed as an option here, so remove that.
--- arch/arm/mach-omap2/am33xx/Kconfig | 32 ++++++++++++++++++++++++++ arch/arm/mach-omap2/am33xx/board.c | 8 +++---- configs/am335x_evm_defconfig | 3 +++ configs/am335x_guardian_defconfig | 3 +++ include/configs/am335x_evm.h | 12 ---------- include/configs/am335x_guardian.h | 5 ---- include/configs/baltos.h | 12 ---------- include/configs/chiliboard.h | 4 ---- include/configs/siemens-am33x-common.h | 7 ------ 9 files changed, 42 insertions(+), 44 deletions(-)
arch/arm/mach-omap2/am33xx/Kconfig +32 -0
@@ -280,3 +280,35 @@ config PUB_ROM_DATA_SIZE image, this area is no longer used, and can be reclaimed for run time use by the boot image. endif + +config AM335X_USB0 + bool "Static mode configuration for USB0 in SPL" + depends on AM33XX && SPL_MUSB_NEW && !SPL_OF_CONTROL + +choice + prompt "USB0 port configuration" + depends on AM335X_USB0 + +config AM335X_USB0_HOST + bool "Port is used in host mode" + +config AM335X_USB0_PERIPHERAL + bool "Port is used in peripheral mode" + +endchoice + +config AM335X_USB1 + bool "Static mode configuration for USB1 in SPL" + depends on AM33XX && SPL_MUSB_NEW && !SPL_OF_CONTROL + +choice + prompt "USB1 port configuration" + depends on AM335X_USB1 + +config AM335X_USB1_HOST + bool "Port is used in host mode" + +config AM335X_USB1_PERIPHERAL + bool "Port is used in peripheral mode" + +endchoice
arch/arm/mach-omap2/am33xx/board.c +4 -4
@@ -242,14 +242,14 @@ static struct ti_musb_plat usb1 = {#endif U_BOOT_DRVINFOS(am33xx_usbs) = { -#if CONFIG_AM335X_USB0_MODE == MUSB_PERIPHERAL +#ifdef CONFIG_AM335X_USB0_PERIPHERAL { "ti-musb-peripheral", &usb0 }, -#elif CONFIG_AM335X_USB0_MODE == MUSB_HOST +#elif defined(CONFIG_AM335X_USB0_HOST) { "ti-musb-host", &usb0 }, #endif -#if CONFIG_AM335X_USB1_MODE == MUSB_PERIPHERAL +#ifdef CONFIG_AM335X_USB1_PERIPHERAL { "ti-musb-peripheral", &usb1 }, -#elif CONFIG_AM335X_USB1_MODE == MUSB_HOST +#elif defined(CONFIG_AM335X_USB1_HOST) { "ti-musb-host", &usb1 }, #endif };
configs/am335x_evm_defconfig +3 -0
@@ -4,6 +4,9 @@ CONFIG_ARCH_OMAP2PLUS=y CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" CONFIG_AM33XX=y +CONFIG_AM335X_USB0=y +CONFIG_AM335X_USB0_PERIPHERAL=y +CONFIG_AM335X_USB1=y CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y CONFIG_TIMESTAMP=y
configs/am335x_guardian_defconfig +3 -0
@@ -10,6 +10,9 @@ CONFIG_ENV_OFFSET=0x500000 CONFIG_DEFAULT_DEVICE_TREE="am335x-guardian" CONFIG_AM33XX=y CONFIG_TARGET_AM335X_GUARDIAN=y +CONFIG_AM335X_USB0=y +CONFIG_AM335X_USB0_PERIPHERAL=y +CONFIG_AM335X_USB1=y CONFIG_SPL_SERIAL=y CONFIG_SPL_DRIVERS_MISC=y CONFIG_BOOTCOUNT_BOOTLIMIT=3
include/configs/am335x_evm.h +0 -12
@@ -201,18 +201,6 @@* in memory. */ -/* -* USB configuration. We enable MUSB support, both for host and for -* gadget. We set USB0 as peripheral and USB1 as host, based on the -* board schematic and physical port wired to each. Then for host we -* add mass storage support and for gadget we add both RNDIS ethernet -* and DFU. -*/ -#define CONFIG_AM335X_USB0 -#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL -#define CONFIG_AM335X_USB1 -#define CONFIG_AM335X_USB1_MODE MUSB_HOST -/* * Disable MMC DM for SPL build and can be re-enabled after adding * DM support in SPL
include/configs/am335x_guardian.h +0 -5
@@ -129,9 +129,4 @@#endif /* CONFIG_MTD_RAW_NAND */ -#define CONFIG_AM335X_USB0 -#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL -#define CONFIG_AM335X_USB1 -#define CONFIG_AM335X_USB1_MODE MUSB_HOST -#endif /* ! __CONFIG_AM335X_GUARDIAN_H */
include/configs/baltos.h +0 -12
@@ -214,18 +214,6 @@#endif #endif -/* -* USB configuration. We enable MUSB support, both for host and for -* gadget. We set USB0 as peripheral and USB1 as host, based on the -* board schematic and physical port wired to each. Then for host we -* add mass storage support and for gadget we add both RNDIS ethernet -* and DFU. -*/ -#define CONFIG_AM335X_USB0 -#define CONFIG_AM335X_USB0_MODE MUSB_HOST -#define CONFIG_AM335X_USB1 -#define CONFIG_AM335X_USB1_MODE MUSB_OTG -/* NAND support */ #ifdef CONFIG_MTD_RAW_NAND #define GPMC_NAND_ECC_LP_x8_LAYOUT 1
include/configs/chiliboard.h +0 -4
@@ -127,10 +127,6 @@#define CONFIG_SYS_NAND_ECCBYTES 14/* NAND: SPL related configs */ -/* USB configuration */ -#define CONFIG_AM335X_USB1 -#define CONFIG_AM335X_USB1_MODE MUSB_HOST -/* * Disable MMC DM for SPL build and can be re-enabled after adding * DM support in SPL
include/configs/siemens-am33x-common.h +0 -7
@@ -104,13 +104,6 @@*/ #ifndef CONFIG_SPL_BUILD -/* -* USB configuration -*/ -#define CONFIG_AM335X_USB0 -#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL -#define CONFIG_AM335X_USB1 -#define CONFIG_AM335X_USB1_MODE MUSB_HOST/* USB DRACO ID as default */ #define CONFIG_USBD_HS
Signature · 1 line
2.25.1
PATCH 2/8 Convert CONFIG_AT91SAM9260 et al to Kconfig
This converts the following to Kconfig:
CONFIG_AT91SAM9260
CONFIG_AT91SAM9G20
CONFIG_AT91SAM9XE
CONFIG_AT91SAM9261
CONFIG_AT91SAM9263
CONFIG_AT91SAM9G45
CONFIG_AT91SAM9M10G45
CONFIG_AT91SAM9N12
CONFIG_AT91SAM9RL
CONFIG_AT91SAM9X5
CONFIG_SAM9X60
CONFIG_SAMA7G5
CONFIG_SAMA5D2
CONFIG_SAMA5D3
CONFIG_SAMA5D4
These options are already select'd as needed, so we're just cleaning up files here.
--- arch/arm/mach-at91/Kconfig | 1 + configs/at91sam9260ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9260ek_dataflash_cs1_defconfig | 2 +- configs/at91sam9260ek_nandflash_defconfig | 2 +- configs/at91sam9261ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9261ek_dataflash_cs3_defconfig | 2 +- configs/at91sam9261ek_nandflash_defconfig | 2 +- configs/at91sam9263ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9263ek_dataflash_defconfig | 2 +- configs/at91sam9263ek_nandflash_defconfig | 2 +- configs/at91sam9263ek_norflash_boot_defconfig | 2 +- configs/at91sam9263ek_norflash_defconfig | 2 +- configs/at91sam9g20ek_2mmc_defconfig | 2 +- configs/at91sam9g20ek_2mmc_nandflash_defconfig | 2 +- configs/at91sam9g20ek_dataflash_cs0_defconfig | 2 +- configs/at91sam9g20ek_dataflash_cs1_defconfig | 2 +- configs/at91sam9g20ek_nandflash_defconfig | 2 +- configs/at91sam9rlek_dataflash_defconfig | 2 +- configs/at91sam9rlek_mmc_defconfig | 2 +- configs/at91sam9rlek_nandflash_defconfig | 2 +- configs/at91sam9xeek_dataflash_cs0_defconfig | 2 +- configs/at91sam9xeek_dataflash_cs1_defconfig | 2 +- configs/at91sam9xeek_nandflash_defconfig | 2 +- configs/axm_defconfig | 1 - configs/corvus_defconfig | 2 +- configs/ethernut5_defconfig | 1 - configs/gurnard_defconfig | 1 - configs/meesc_dataflash_defconfig | 2 +- configs/meesc_defconfig | 2 +- configs/pm9261_defconfig | 1 - configs/pm9263_defconfig | 1 - configs/sama5d27_giantboard_defconfig | 1 - configs/sama5d27_som1_ek_mmc1_defconfig | 1 - configs/sama5d27_som1_ek_mmc_defconfig | 1 - configs/sama5d27_som1_ek_qspiflash_defconfig | 1 - configs/sama5d27_wlsom1_ek_mmc_defconfig | 1 - configs/sama5d27_wlsom1_ek_qspiflash_defconfig | 1 - configs/sama5d2_icp_mmc_defconfig | 1 - configs/sama5d2_icp_qspiflash_defconfig | 1 - configs/sama5d2_ptc_ek_mmc_defconfig | 1 - configs/sama5d2_ptc_ek_nandflash_defconfig | 1 - configs/sama5d2_xplained_emmc_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 2 +- configs/sama5d2_xplained_qspiflash_defconfig | 2 +- configs/smartweb_defconfig | 1 - configs/snapper9260_defconfig | 1 - configs/snapper9g20_defconfig | 1 - configs/taurus_defconfig | 1 - configs/usb_a9263_dataflash_defconfig | 2 +- 49 files changed, 30 insertions(+), 48 deletions(-)
arch/arm/mach-at91/Kconfig +1 -0
@@ -176,6 +176,7 @@ config TARGET_SAMA5D2_XPLAINED config TARGET_SAMA5D27_SOM1_EK bool "SAMA5D27 SOM1 EK board" + select SAMA5D2 select BOARD_EARLY_INIT_F select BOARD_LATE_INIT select CPU_V7A
configs/at91sam9260ek_dataflash_cs0_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS0" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9260ek_dataflash_cs1_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_DATAFLASH_CS1" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS1" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9260ek_nandflash_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -1
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -1
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS3" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS3" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9261ek_nandflash_defconfig +1 -1
@@ -14,7 +14,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/at91sam9263ek_dataflash_cs0_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9263ek_dataflash_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9263ek_nandflash_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/at91sam9263ek_norflash_boot_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_BOOT_NORFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_BOOT_NORFLASH" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/at91sam9263ek_norflash_defconfig +1 -1
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xffffee00 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NORFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NORFLASH" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set
configs/at91sam9g20ek_2mmc_defconfig +1 -1
@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_MMC" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
configs/at91sam9g20ek_2mmc_nandflash_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/at91sam9g20ek_dataflash_cs0_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS0" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9g20ek_dataflash_cs1_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_DATAFLASH_CS1" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS1" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9g20ek_nandflash_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/at91sam9rlek_dataflash_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_DATAFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9rlek_mmc_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 mtdparts=atmel_nand:8M(bootstrap/uboot/kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootwait"
configs/at91sam9rlek_nandflash_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9RL,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256K(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
configs/at91sam9xeek_dataflash_cs0_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS0" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9xeek_dataflash_cs1_defconfig +1 -1
@@ -17,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_DATAFLASH_CS1" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS1" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9xeek_nandflash_defconfig +1 -1
@@ -15,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/axm_defconfig +0 -1
@@ -28,7 +28,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run flash_self"
configs/corvus_defconfig +1 -1
@@ -20,7 +20,7 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SYS_LOAD_ADDR=0x70000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/ethernut5_defconfig +0 -1
@@ -14,7 +14,6 @@ CONFIG_ENV_SECT_SIZE=0x21000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="ethernut5" CONFIG_SYS_LOAD_ADDR=0x020000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9XE" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/gurnard_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard" CONFIG_SYS_LOAD_ADDR=0x23000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G45" CONFIG_BOOTDELAY=3 # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_BOARD_EARLY_INIT_F=y
configs/meesc_dataflash_defconfig +1 -1
@@ -14,7 +14,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" CONFIG_SYS_LOAD_ADDR=0x20100000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y CONFIG_BOARD_EARLY_INIT_F=y
configs/meesc_defconfig +1 -1
@@ -12,7 +12,7 @@ CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" CONFIG_SYS_LOAD_ADDR=0x20100000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y CONFIG_BOARD_EARLY_INIT_F=y
configs/pm9261_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek" CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 "
configs/pm9263_defconfig +0 -1
@@ -11,7 +11,6 @@ CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek" CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=/dev/mtdblock4 rootfstype=jffs2 fbcon=rotate:3 "
configs/sama5d27_giantboard_defconfig +0 -1
@@ -26,7 +26,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_AUTOBOOT_KEYED=y
configs/sama5d27_som1_ek_mmc1_defconfig +0 -1
@@ -25,7 +25,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d27_som1_ek_mmc_defconfig +0 -1
@@ -26,7 +26,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d27_som1_ek_qspiflash_defconfig +0 -1
@@ -26,7 +26,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d27_wlsom1_ek_mmc_defconfig +0 -1
@@ -24,7 +24,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d27_wlsom1_ek_qspiflash_defconfig +0 -1
@@ -24,7 +24,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_QSPI_BOOT=y CONFIG_SPI_BOOT=y CONFIG_BOOTDELAY=3
configs/sama5d2_icp_mmc_defconfig +0 -1
@@ -24,7 +24,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d2_icp_qspiflash_defconfig +0 -1
@@ -18,7 +18,6 @@ CONFIG_SYS_BOOT_GET_CMDLINE=y CONFIG_SYS_BOOT_GET_KBD=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_QSPI_BOOT=y CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3
configs/sama5d2_ptc_ek_mmc_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d2_ptc_ek_nandflash_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d2_xplained_emmc_defconfig +1 -1
@@ -25,7 +25,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d2_xplained_mmc_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/sama5d2_xplained_qspiflash_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y
configs/smartweb_defconfig +0 -1
@@ -22,7 +22,6 @@ CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" CONFIG_BOOTDELAY=3 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
configs/snapper9260_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000 CONFIG_SYS_LOAD_ADDR=0x23000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 ip=any"
configs/snapper9g20_defconfig +0 -1
@@ -10,7 +10,6 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000 CONFIG_SYS_LOAD_ADDR=0x23000000 CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 ip=any"
configs/taurus_defconfig +0 -1
@@ -30,7 +30,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/usb_a9263_dataflash_defconfig +1 -1
@@ -13,7 +13,7 @@ CONFIG_ENV_SECT_SIZE=0x2000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="usb_a9263" CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9263,SYS_USE_DATAFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock1 mtdparts=mtdparts=atmel_nand:16m(kernel)ro,120m(root1),-(root2) rw rootfstype=jffs2"
Signature · 1 line
2.25.1
Re: [PATCH 2/8] Convert CONFIG_AT91SAM9260 et al to Kconfig
Quoted 17 lines · Tom Rini
This converts the following to
Kconfig:CONFIG_AT91SAM9260 CONFIG_AT91SAM9G20 CONFIG_AT91SAM9XE CONFIG_AT91SAM9261 CONFIG_AT91SAM9263 CONFIG_AT91SAM9G45 CONFIG_AT91SAM9M10G45 CONFIG_AT91SAM9N12 CONFIG_AT91SAM9RL CONFIG_AT91SAM9X5 CONFIG_SAM9X60 CONFIG_SAMA7G5 CONFIG_SAMA5D2 CONFIG_SAMA5D3 CONFIG_SAMA5D4
Quoted 5 lines
These options are already select'd as needed, so we're just cleaning up files here.
Cc Eugen Hristev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 3/8 Convert CONFIG_AT91SAM9G20EK et al to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_AT91SAM9G20EK
CONFIG_AT91SAM9260EK
CONFIG_AT91SAM9G20EK_2MMC
--- board/atmel/at91sam9260ek/Kconfig | 15 +++++++++++++++ configs/at91sam9260ek_dataflash_cs0_defconfig | 1 + configs/at91sam9260ek_dataflash_cs1_defconfig | 1 + configs/at91sam9260ek_nandflash_defconfig | 1 + configs/at91sam9g20ek_2mmc_defconfig | 4 +++- configs/at91sam9g20ek_2mmc_nandflash_defconfig | 4 +++- configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 + configs/at91sam9g20ek_nandflash_defconfig | 1 + configs/at91sam9xeek_dataflash_cs0_defconfig | 1 + configs/at91sam9xeek_dataflash_cs1_defconfig | 1 + configs/at91sam9xeek_nandflash_defconfig | 1 + include/configs/at91sam9260ek.h | 9 --------- 13 files changed, 30 insertions(+), 11 deletions(-)
board/atmel/at91sam9260ek/Kconfig +15 -0
@@ -9,4 +9,19 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "at91sam9260ek" +choice + prompt "Evaluation board" + +config AT91SAM9G20EK + bool "Atmel AT91SAM9G20 EK" + +config AT91SAM9260EK + bool "Atmel AT91SAM9260 EK" + +endchoice + +config AT91SAM9G20EK_2MMC + bool "Atmel AT91SAM9G20 EK 2MMC variant" + depends on AT91SAM9260EK + endif
configs/at91sam9260ek_dataflash_cs0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9260ek_dataflash_cs1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9260ek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
configs/at91sam9g20ek_2mmc_defconfig +3 -1
@@ -6,6 +6,8 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x23000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y +CONFIG_AT91SAM9G20EK_2MMC=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x2000
@@ -16,7 +18,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_MMC" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_MMC" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
configs/at91sam9g20ek_2mmc_nandflash_defconfig +3 -1
@@ -6,6 +6,8 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y +CONFIG_AT91SAM9G20EK_2MMC=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek_2mmc"
@@ -15,7 +17,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20EK_2MMC,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/at91sam9g20ek_dataflash_cs0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9g20ek_dataflash_cs1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9g20ek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g20ek"
configs/at91sam9xeek_dataflash_cs0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9xeek_dataflash_cs1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9xeek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9260ek"
include/configs/at91sam9260ek.h +0 -9
@@ -27,15 +27,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* main clock xtal */ -/* Define actual evaluation board type from used processor type */ -#ifdef CONFIG_AT91SAM9G20 -# define CONFIG_AT91SAM9G20EK /* It's an Atmel AT91SAM9G20 EK */ -#else -# define CONFIG_AT91SAM9260EK /* It's an Atmel AT91SAM9260 EK */ -#endif - -/* Misc CPU related */ -/* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
Signature · 1 line
2.25.1
Re: [PATCH 3/8] Convert CONFIG_AT91SAM9G20EK et al to Kconfig
Quoted 7 lines · Tom Rini
This converts the following to
Kconfig:CONFIG_AT91SAM9G20EK CONFIG_AT91SAM9260EK CONFIG_AT91SAM9G20EK_2MMCCc Eugen Hristev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 4/8 Convert CONFIG_AT91SAM9G10EK et al to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_AT91SAM9G10EK
CONFIG_AT91SAM9261EK
CONFIG_AT91SAM9G10
--- board/atmel/at91sam9261ek/Kconfig | 14 ++++++++++++++ configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 3 ++- configs/at91sam9g10ek_dataflash_cs3_defconfig | 3 ++- configs/at91sam9g10ek_nandflash_defconfig | 3 ++- include/configs/at91sam9261ek.h | 6 ------ 8 files changed, 23 insertions(+), 9 deletions(-)
board/atmel/at91sam9261ek/Kconfig +14 -0
@@ -9,4 +9,18 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "at91sam9261ek" +choice + prompt "Evaluation board" + +config AT91SAM9G10EK + bool "Atmel AT91SAM9G10 EK" + +config AT91SAM9261EK + bool "Atmel AT91SAM9261 EK" + +config AT91SAM9G10 + bool "Atmel AT91SAM9G10 EK" + +endchoice + endif
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_AT91SAM9261EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_AT91SAM9261EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9261ek_nandflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_AT91SAM9261EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
configs/at91sam9g10ek_dataflash_cs0_defconfig +2 -1
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_AT91SAM9G10=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
@@ -16,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS0" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS0" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9g10ek_dataflash_cs3_defconfig +2 -1
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_AT91SAM9G10=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
@@ -16,7 +17,7 @@ CONFIG_DEBUG_UART_BASE=0xfffff200 CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_DATAFLASH_CS3" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_DATAFLASH_CS3" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/mtdblock0 mtdparts=atmel_nand:-(root) rw rootfstype=jffs2"
configs/at91sam9g10ek_nandflash_defconfig +2 -1
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_AT91SAM9G10=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9261ek"
@@ -14,7 +15,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_ENV_OFFSET_REDUND=0x100000 CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G10,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
include/configs/at91sam9261ek.h +0 -6
@@ -14,12 +14,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432 MHz crystal */ -#ifdef CONFIG_AT91SAM9G10 -#define CONFIG_AT91SAM9G10EK /* It's an Atmel AT91SAM9G10 EK*/ -#else -#define CONFIG_AT91SAM9261EK /* It's an Atmel AT91SAM9261 EK*/ -#endif -#include <asm/hardware.h> #define CONFIG_ATMEL_LEGACY
Signature · 1 line
2.25.1
Re: [PATCH 4/8] Convert CONFIG_AT91SAM9G10EK et al to Kconfig
Quoted 7 lines · Tom Rini
This converts the following to
Kconfig:CONFIG_AT91SAM9G10EK CONFIG_AT91SAM9261EK CONFIG_AT91SAM9G10Cc Eugen Hristev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 5/8 atmel: Remove CONFIG_AT91SAM9G45EKES
In reply to Tom RiniThis symbol is used only once, and in comparison with an unset symbol, so drop it.
--- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 4 ---- include/configs/at91sam9m10g45ek.h | 2 -- 2 files changed, 6 deletions(-)
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +0 -4
@@ -267,11 +267,7 @@ int board_early_init_f(void)int board_init (void ) {/* arch number of AT91SAM9M10G45EK-Board */ -#ifdef CONFIG_AT91SAM9M10G45EK gd->bd->bi_arch_number =MACH_TYPE_AT91SAM9M10G45EK ; -#elif definedCONFIG_AT91SAM9G45EKES - gd->bd->bi_arch_number =MACH_TYPE_AT91SAM9G45EKES ; -#endif /* adress of boot parameters */ gd->bd->bi_boot_params =CONFIG_SYS_SDRAM_BASE +0x100 ;
include/configs/at91sam9m10g45ek.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ -#define CONFIG_AT91SAM9M10G45EK -/* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */
Signature · 1 line
2.25.1
Re: [PATCH 5/8] atmel: Remove CONFIG_AT91SAM9G45EKES
Quoted 5 lines · Tom Rini
This symbol is used only once, and in comparison with an unset symbol, so drop it.
Cc Eugen Hristev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 6/8 atmel: Remove CONFIG_AT91SAM9G45_LCD_BASE
In reply to Tom RiniThis variable is used once and is noted as board-specific. Use the value directly with a comment.
--- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 3 ++- include/configs/at91sam9m10g45ek.h | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-)
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +2 -1
@@ -214,7 +214,8 @@ static void at91sam9m10g45ek_lcd_hw_init(void)at91_periph_clk_enable (ATMEL_ID_LCDC ); - gd->fb_base =CONFIG_AT91SAM9G45_LCD_BASE ; +/* board specific(not enough SRAM) */ + gd->fb_base =0x73E00000 ; }#ifdef CONFIG_LCD_INFO
include/configs/at91sam9m10g45ek.h +0 -2
@@ -27,8 +27,6 @@#define CONFIG_LCD_INFO_BELOW_LOGO #define CONFIG_ATMEL_LCD #define CONFIG_ATMEL_LCD_RGB565 -/* board specific(not enough SRAM) */ -#define CONFIG_AT91SAM9G45_LCD_BASE 0x73E00000/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x70000000
Signature · 1 line
2.25.1
Re: [PATCH 6/8] atmel: Remove CONFIG_AT91SAM9G45_LCD_BASE
Quoted 5 lines · Tom Rini
This variable is used once and is noted as board-specific. Use the value directly with a comment.
Cc Eugen Hristev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 7/8 Convert CONFIG_AT91_GPIO_PULLUP to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_AT91_GPIO_PULLUP
--- arch/arm/mach-at91/Kconfig | 4 ++++ configs/axm_defconfig | 1 + configs/corvus_defconfig | 1 + configs/gurnard_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/taurus_defconfig | 1 + include/configs/corvus.h | 1 - include/configs/smartweb.h | 1 - include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/taurus.h | 1 - 13 files changed, 11 insertions(+), 5 deletions(-)
arch/arm/mach-at91/Kconfig +4 -0
@@ -311,6 +311,10 @@ config AT91_EFLASH Enable the driver for the embedded flash used in the Atmel AT91SAM9XE devices. +config AT91_GPIO_PULLUP + bool "Keep pullups on peripheral pins" + depends on CPU_ARM926EJS + source "board/atmel/at91sam9260ek/Kconfig" source "board/atmel/at91sam9261ek/Kconfig" source "board/atmel/at91sam9263ek/Kconfig"
configs/axm_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_SYS_TEXT_BASE=0x21000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_TAURUS=y +CONFIG_AT91_GPIO_PULLUP=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/corvus_defconfig +1 -0
@@ -9,6 +9,7 @@ CONFIG_SYS_TEXT_BASE=0x72000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_CORVUS=y +CONFIG_AT91_GPIO_PULLUP=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/gurnard_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_ARCH_AT91=y CONFIG_SYS_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_TARGET_GURNARD=y +CONFIG_AT91_GPIO_PULLUP=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000
configs/smartweb_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_SYS_TEXT_BASE=0x23000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SMARTWEB=y +CONFIG_AT91_GPIO_PULLUP=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/snapper9260_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_ARCH_AT91=y CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_TARGET_SNAPPER9260=y +CONFIG_AT91_GPIO_PULLUP=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000
configs/snapper9g20_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_ARCH_AT91=y CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_TARGET_SNAPPER9260=y +CONFIG_AT91_GPIO_PULLUP=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000
configs/taurus_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SYS_TEXT_BASE=0x21000000 CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_TAURUS=y +CONFIG_AT91_GPIO_PULLUP=y CONFIG_BOARD_TAURUS=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
include/configs/corvus.h +0 -1
@@ -31,7 +31,6 @@/* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */ /* serial console */ #define CONFIG_USART_BASE ATMEL_BASE_DBGU
include/configs/smartweb.h +0 -1
@@ -74,7 +74,6 @@/* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */ /* serial console */ #define CONFIG_USART_BASE ATMEL_BASE_DBGU
include/configs/snapper9260.h +0 -1
@@ -54,7 +54,6 @@/* GPIOs and IO expander */ #define CONFIG_ATMEL_LEGACY -#define CONFIG_AT91_GPIO_PULLUP 1#define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR 0x28#define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x28, 16} }
include/configs/snapper9g45.h +0 -1
@@ -50,7 +50,6 @@/* GPIOs and IO expander */ #define CONFIG_ATMEL_LEGACY -#define CONFIG_AT91_GPIO_PULLUP 1/* UARTs/Serial console */
include/configs/taurus.h +0 -1
@@ -36,7 +36,6 @@/* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_AT91_GPIO_PULLUP 1/* keep pullups on peripheral pins */ #define CONFIG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS
Signature · 1 line
2.25.1
Re: [PATCH 7/8] Convert CONFIG_AT91_GPIO_PULLUP to Kconfig
Quoted 5 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_AT91_GPIO_PULLUPCc Eugen Hristev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
PATCH 8/8 Convert CONFIG_ATMEL_LEGACY to Kconfig
In reply to Tom RiniThis converts the following to Kconfig:
CONFIG_ATMEL_LEGACY
--- arch/arm/mach-at91/Kconfig | 3 +++ configs/at91sam9260ek_dataflash_cs0_defconfig | 1 + configs/at91sam9260ek_dataflash_cs1_defconfig | 1 + configs/at91sam9260ek_nandflash_defconfig | 1 + configs/at91sam9261ek_dataflash_cs0_defconfig | 1 + configs/at91sam9261ek_dataflash_cs3_defconfig | 1 + configs/at91sam9261ek_nandflash_defconfig | 1 + configs/at91sam9263ek_dataflash_cs0_defconfig | 1 + configs/at91sam9263ek_dataflash_defconfig | 1 + configs/at91sam9263ek_nandflash_defconfig | 1 + configs/at91sam9263ek_norflash_boot_defconfig | 1 + configs/at91sam9263ek_norflash_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 + configs/at91sam9g10ek_nandflash_defconfig | 1 + configs/at91sam9g20ek_2mmc_defconfig | 1 + configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 + configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 + configs/at91sam9g20ek_nandflash_defconfig | 1 + configs/at91sam9m10g45ek_mmc_defconfig | 1 + configs/at91sam9m10g45ek_nandflash_defconfig | 1 + configs/at91sam9rlek_dataflash_defconfig | 1 + configs/at91sam9rlek_mmc_defconfig | 1 + configs/at91sam9rlek_nandflash_defconfig | 1 + configs/at91sam9x5ek_dataflash_defconfig | 1 + configs/at91sam9x5ek_mmc_defconfig | 1 + configs/at91sam9x5ek_nandflash_defconfig | 1 + configs/at91sam9x5ek_spiflash_defconfig | 1 + configs/at91sam9xeek_dataflash_cs0_defconfig | 1 + configs/at91sam9xeek_dataflash_cs1_defconfig | 1 + configs/at91sam9xeek_nandflash_defconfig | 1 + configs/axm_defconfig | 1 + configs/corvus_defconfig | 1 + configs/gardena-smart-gateway-at91sam_defconfig | 1 + configs/gurnard_defconfig | 1 + configs/pm9g45_defconfig | 1 + configs/sam9x60ek_mmc_defconfig | 1 + configs/sam9x60ek_nandflash_defconfig | 1 + configs/sam9x60ek_qspiflash_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/snapper9260_defconfig | 1 + configs/snapper9g20_defconfig | 1 + configs/taurus_defconfig | 1 + include/configs/at91sam9260ek.h | 3 --- include/configs/at91sam9261ek.h | 2 -- include/configs/at91sam9263ek.h | 1 - include/configs/at91sam9m10g45ek.h | 3 --- include/configs/at91sam9rlek.h | 2 -- include/configs/at91sam9x5ek.h | 1 - include/configs/corvus.h | 5 ----- include/configs/gardena-smart-gateway-at91sam.h | 3 --- include/configs/pm9g45.h | 3 --- include/configs/sam9x60ek.h | 3 --- include/configs/smartweb.h | 3 --- include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 3 --- include/configs/taurus.h | 3 --- 58 files changed, 46 insertions(+), 36 deletions(-)
arch/arm/mach-at91/Kconfig +3 -0
@@ -315,6 +315,9 @@ config AT91_GPIO_PULLUP bool "Keep pullups on peripheral pins" depends on CPU_ARM926EJS +config ATMEL_LEGACY + bool "Legacy GPIO support" + source "board/atmel/at91sam9260ek/Kconfig" source "board/atmel/at91sam9261ek/Kconfig" source "board/atmel/at91sam9263ek/Kconfig"
configs/at91sam9260ek_dataflash_cs0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9260ek_dataflash_cs1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9260ek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y
configs/at91sam9261ek_dataflash_cs0_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9261EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9261ek_dataflash_cs3_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9261EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9261ek_nandflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9261EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y
configs/at91sam9263ek_dataflash_cs0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9263EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9263ek_dataflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9263EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9263ek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9263EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9263ek"
configs/at91sam9263ek_norflash_boot_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x0000000 CONFIG_SYS_MALLOC_LEN=0x50000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9263EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
configs/at91sam9263ek_norflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x50000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9263EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
configs/at91sam9g10ek_dataflash_cs0_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9G10=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9g10ek_dataflash_cs3_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9G10=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9g10ek_nandflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9261EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9G10=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y
configs/at91sam9g20ek_2mmc_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x23000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_AT91SAM9G20EK_2MMC=y CONFIG_NR_DRAM_BANKS=1
configs/at91sam9g20ek_2mmc_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_AT91SAM9G20EK_2MMC=y CONFIG_NR_DRAM_BANKS=1
configs/at91sam9g20ek_dataflash_cs0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9g20ek_dataflash_cs1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9g20ek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y
configs/at91sam9m10g45ek_mmc_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x2c000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9M10G45EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y
configs/at91sam9m10g45ek_nandflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9M10G45EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
configs/at91sam9rlek_dataflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9RLEK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9rlek_mmc_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x2c000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9RLEK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y
configs/at91sam9rlek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21F00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9RLEK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9rlek"
configs/at91sam9x5ek_dataflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9X5EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200 CONFIG_ENV_OFFSET=0x4200
configs/at91sam9x5ek_mmc_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9X5EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y
configs/at91sam9x5ek_nandflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9X5EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9g35ek"
configs/at91sam9x5ek_spiflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x26f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9X5EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x3000 CONFIG_ENV_OFFSET=0x5000
configs/at91sam9xeek_dataflash_cs0_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9xeek_dataflash_cs1_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x2d000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x4200
configs/at91sam9xeek_nandflash_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_AT91SAM9260EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_AT91SAM9260EK=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y
configs/axm_defconfig +1 -0
@@ -13,6 +13,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_TAURUS=y CONFIG_AT91_GPIO_PULLUP=y +CONFIG_ATMEL_LEGACY=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/corvus_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_CORVUS=y CONFIG_AT91_GPIO_PULLUP=y +CONFIG_ATMEL_LEGACY=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/gardena-smart-gateway-at91sam_defconfig +1 -0
@@ -7,6 +7,7 @@ CONFIG_SYS_TEXT_BASE=0x22900000 CONFIG_SYS_MALLOC_LEN=0x1000000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_GARDENA_SMART_GATEWAY_AT91SAM=y +CONFIG_ATMEL_LEGACY=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/gurnard_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_TARGET_GURNARD=y CONFIG_AT91_GPIO_PULLUP=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000
configs/pm9g45_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x73f00000 CONFIG_SYS_MALLOC_LEN=0x80000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_PM9G45=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="at91sam9m10g45ek"
configs/sam9x60ek_mmc_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_SAM9X60EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SIZE=0x4000 CONFIG_DM_GPIO=y
configs/sam9x60ek_nandflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_SAM9X60EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=8 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="sam9x60ek"
configs/sam9x60ek_qspiflash_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x23f00000 CONFIG_SYS_MALLOC_LEN=0x81000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_TARGET_SAM9X60EK=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=8 CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_DM_GPIO=y
configs/smartweb_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SMARTWEB=y CONFIG_AT91_GPIO_PULLUP=y +CONFIG_ATMEL_LEGACY=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/snapper9260_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_TARGET_SNAPPER9260=y CONFIG_AT91_GPIO_PULLUP=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000
configs/snapper9g20_defconfig +1 -0
@@ -6,6 +6,7 @@ CONFIG_SYS_TEXT_BASE=0x21f00000 CONFIG_SYS_MALLOC_LEN=0x100000 CONFIG_TARGET_SNAPPER9260=y CONFIG_AT91_GPIO_PULLUP=y +CONFIG_ATMEL_LEGACY=y CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x80000
configs/taurus_defconfig +1 -0
@@ -14,6 +14,7 @@ CONFIG_SYS_MALLOC_LEN=0x460000 CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_TAURUS=y CONFIG_AT91_GPIO_PULLUP=y +CONFIG_ATMEL_LEGACY=y CONFIG_BOARD_TAURUS=y CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
include/configs/at91sam9260ek.h +0 -3
@@ -27,9 +27,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* main clock xtal */ -/* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* * SDRAM: 1 bank, min 32, max 128 MB * Initialized before u-boot gets started.
include/configs/at91sam9261ek.h +0 -2
@@ -16,8 +16,6 @@#include <asm/hardware.h> -#define CONFIG_ATMEL_LEGACY -/* * Hardware drivers */
include/configs/at91sam9263ek.h +0 -1
@@ -30,7 +30,6 @@/* * Hardware drivers */ -#define CONFIG_ATMEL_LEGACY /* LCD */ #define LCD_BPP LCD_COLOR8
include/configs/at91sam9m10g45ek.h +0 -3
@@ -10,14 +10,11 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ /* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ /* LCD */ #define LCD_BPP LCD_COLOR8
include/configs/at91sam9rlek.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* main clock xtal */ -#define CONFIG_ATMEL_LEGACY -/* * Hardware drivers */
include/configs/at91sam9x5ek.h +0 -1
@@ -13,7 +13,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ /* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ /* * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0)
include/configs/corvus.h +0 -5
@@ -23,15 +23,10 @@* hex number here! */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ -/* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* serial console */ #define CONFIG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS
include/configs/gardena-smart-gateway-at91sam.h +0 -3
@@ -17,9 +17,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ -/* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x20000000#define CONFIG_SYS_SDRAM_SIZE 0x08000000/* 128 megs */
include/configs/pm9g45.h +0 -3
@@ -19,9 +19,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ -/* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* SDRAM */ #define CONFIG_SYS_SDRAM_BASE 0x70000000#define CONFIG_SYS_SDRAM_SIZE 0x08000000
include/configs/sam9x60ek.h +0 -3
@@ -17,9 +17,6 @@#define CONFIG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID 0/* ignored in arm */ -/* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0) * NB: in this case, USB 1.1 devices won't be recognized.
include/configs/smartweb.h +0 -3
@@ -72,9 +72,6 @@#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 -/* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* serial console */ #define CONFIG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS
include/configs/snapper9260.h +0 -1
@@ -53,7 +53,6 @@#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2/* GPIOs and IO expander */ -#define CONFIG_ATMEL_LEGACY #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR 0x28#define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x28, 16} }
include/configs/snapper9g45.h +0 -3
@@ -48,9 +48,6 @@#define CONFIG_ATMEL_LCD #define CONFIG_GURNARD_SPLASH -/* GPIOs and IO expander */ -#define CONFIG_ATMEL_LEGACY -/* UARTs/Serial console */ /* Boot options */
include/configs/taurus.h +0 -3
@@ -34,9 +34,6 @@/* Misc CPU related */ -/* general purpose I/O */ -#define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -#define CONFIG_USART_BASE ATMEL_BASE_DBGU#define CONFIG_USART_ID ATMEL_ID_SYS
Signature · 1 line
2.25.1
Re: [PATCH 8/8] Convert CONFIG_ATMEL_LEGACY to Kconfig
Quoted 5 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_ATMEL_LEGACYCc Eugen Hristev <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
Quoted 6 lines · Tom Rini
This converts the following to
Kconfig:CONFIG_AM335X_USB0 CONFIG_AM335X_USB0_MODE CONFIG_AM335X_USB1 CONFIG_AM335X_USB1_MODE
Quoted 6 lines
We do this by introducing specific options for static configuration of USB0/USB1 in SPL rather than defining
CONFIG_AM335X_USBx_MODEto the enum value being used. Furthermore, with how the code is used now we do not need to have OTG mode exposed as an option here, so remove that.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom