December 2017 - U-Boot

[U-Boot] [PATCH] tools: env: Add support for direct read/write UBI volumes
by S. Lockwood-Childs 01 Dec '17

01 Dec '17

Up to now we were able to read/write environment data from/to UBI volumes only indirectly by gluebi driver. This driver creates NAND MTD on top of UBI volumes, which is quite a workaroung for this use case. Add support for direct read/write UBI volumes in order to not use obsolete gluebi driver. Forward-ported from this patch: http://patchwork.ozlabs.org/patch/619305/ Original patch: Signed-off-by: Marcin Niestroj <m.niestroj(a)grinn-global.com> Forward port: Signed-off-by: S. Lockwood-Childs <sjl(a)vctlabs.com> --- tools/env/fw_env.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++- tools/env/fw_env.config | 8 ++ 2 files changed, 261 insertions(+), 2 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index ab06415..867fba5 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -25,6 +25,7 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <unistd.h> +#include <dirent.h> #ifdef MTD_OLD # include <stdint.h> @@ -34,6 +35,8 @@ # include <mtd/mtd-user.h> #endif +#include <mtd/ubi-user.h> + #include "fw_env_private.h" #include "fw_env.h" @@ -58,6 +61,7 @@ struct envdev_s { ulong erase_size; /* device erase size */ ulong env_sectors; /* number of environment sectors */ uint8_t mtd_type; /* type of the MTD device */ + int is_ubi; /* set if we use UBI volume */ }; static struct envdev_s envdevices[2] = @@ -76,6 +80,7 @@ static int dev_current; #define DEVESIZE(i) envdevices[(i)].erase_size #define ENVSECTORS(i) envdevices[(i)].env_sectors #define DEVTYPE(i) envdevices[(i)].mtd_type +#define IS_UBI(i) envdevices[(i)].is_ubi #define CUR_ENVSIZE ENVSIZE(dev_current) @@ -122,6 +127,228 @@ static unsigned char obsolete_flag = 0; #define DEFAULT_ENV_INSTANCE_STATIC #include <env_default.h> +#define UBI_DEV_START "/dev/ubi" +#define UBI_SYSFS "/sys/class/ubi" +#define UBI_VOL_NAME_PATT "ubi%d_%d" + +static int is_ubi_devname(const char *devname) +{ + return !strncmp(devname, UBI_DEV_START, sizeof(UBI_DEV_START) - 1); +} + +static int ubi_check_volume_sysfs_name(const char *volume_sysfs_name, + const char *volname) +{ + char path[256]; + FILE *file; + char *name; + int ret; + + strcpy(path, UBI_SYSFS "/"); + strcat(path, volume_sysfs_name); + strcat(path, "/name"); + + file = fopen(path, "r"); + if (!file) + return -1; + + ret = fscanf(file, "%ms", &name); + fclose(file); + if (ret <= 0 || !name) { + fprintf(stderr, + "Failed to read from file %s, ret = %d, name = %s\n", + path, ret, name); + return -1; + } + + if (!strcmp(name, volname)) { + free(name); + return 0; + } + free(name); + + return -1; +} + +static int ubi_get_volnum_by_name(int devnum, const char *volname) +{ + DIR *sysfs_ubi; + struct dirent *dirent; + int ret; + int tmp_devnum; + int volnum; + + sysfs_ubi = opendir(UBI_SYSFS); + if (!sysfs_ubi) + return -1; + +#ifdef DEBUG + fprintf(stderr, "Looking for volume name \"%s\"\n", volname); +#endif + + while (1) { + dirent = readdir(sysfs_ubi); + if (!dirent) + return -1; + + ret = sscanf(dirent->d_name, UBI_VOL_NAME_PATT, + &tmp_devnum, &volnum); + if (ret == 2 && devnum == tmp_devnum) { + if (ubi_check_volume_sysfs_name(dirent->d_name, + volname) == 0) + return volnum; + } + } + + return -1; +} + +static int ubi_get_devnum_by_devname(const char *devname) +{ + int devnum; + int ret; + + ret = sscanf(devname + sizeof(UBI_DEV_START) - 1, "%d", &devnum); + if (ret != 1) + return -1; + + return devnum; +} + +static const char *ubi_get_volume_devname(const char *devname, + const char *volname) +{ + char *volume_devname; + int volnum; + int devnum; + int ret; + + devnum = ubi_get_devnum_by_devname(devname); + if (devnum < 0) + return NULL; + + volnum = ubi_get_volnum_by_name(devnum, volname); + if (volnum < 0) + return NULL; + + ret = asprintf(&volume_devname, "%s_%d", devname, volnum); + if (ret < 0) + return NULL; + +#ifdef DEBUG + fprintf(stderr, "Found ubi volume \"%s:%s\" -> %s\n", + devname, volname, volume_devname); +#endif + + return volume_devname; +} + +static void ubi_check_dev(unsigned int dev_id) +{ + char *devname = (char *)DEVNAME(dev_id); + char *pname; + const char *volname = NULL; + const char *volume_devname; + + if (!is_ubi_devname(DEVNAME(dev_id))) + return; + + IS_UBI(dev_id) = 1; + + for (pname = devname; *pname != '\0'; pname++) { + if (*pname == ':') { + *pname = '\0'; + volname = pname + 1; + break; + } + } + + if (volname) { + /* Let's find real volume device name */ + volume_devname = ubi_get_volume_devname(devname, volname); + if (!volume_devname) { + fprintf(stderr, "Didn't found ubi volume \"%s\"\n", + volname); + return; + } + + free(devname); + DEVNAME(dev_id) = volume_devname; + } +} + +static int ubi_update_start(int fd, int64_t bytes) +{ + if (ioctl(fd, UBI_IOCVOLUP, &bytes)) + return -1; + return 0; +} + +static int ubi_read(int fd, void *buf, size_t count) +{ + ssize_t ret; + + while (count > 0) { + ret = read(fd, buf, count); + if (ret > 0) { + count -= ret; + buf += ret; + + continue; + } + + if (ret == 0) { + /* + * Happens in case of too short volume data size. If we + * return error status we will fail it will be treated + * as UBI device error. + * + * Leave catching this error to CRC check. + */ + fprintf(stderr, "Warning: end of data on ubi volume\n"); + return 0; + } else if (errno == EBADF) { + /* + * Happens in case of corrupted volume. The same as + * above, we cannot return error now, as we will still + * be able to successfully write environment later. + */ + fprintf(stderr, "Warning: corrupted volume?\n"); + return 0; + } else if (errno == EINTR) { + continue; + } + + fprintf(stderr, "Cannot read %u bytes from ubi volume, %s\n", + (unsigned int)count, strerror(errno)); + return -1; + } + + return 0; +} + +static int ubi_write(int fd, const void *buf, size_t count) +{ + ssize_t ret; + + while (count > 0) { + ret = write(fd, buf, count); + if (ret <= 0) { + if (ret < 0 && errno == EINTR) + continue; + + fprintf(stderr, "Cannot write %u bytes to ubi volume\n", + (unsigned int)count); + return -1; + } + + count -= ret; + buf += ret; + } + + return 0; +} + static int flash_io (int mode); static int parse_config(struct env_opts *opts); @@ -1022,6 +1249,12 @@ static int flash_write (int fd_current, int fd_target, int dev_target) DEVOFFSET (dev_target), DEVNAME (dev_target)); #endif + if (IS_UBI(dev_target)) { + if (ubi_update_start(fd_target, CUR_ENVSIZE) < 0) + return 0; + return ubi_write(fd_target, environment.image, CUR_ENVSIZE); + } + rc = flash_write_buf(dev_target, fd_target, environment.image, CUR_ENVSIZE); if (rc < 0) @@ -1046,6 +1279,12 @@ static int flash_read (int fd) { int rc; + if (IS_UBI(dev_current)) { + DEVTYPE(dev_current) = MTD_ABSENT; + + return ubi_read(fd, environment.image, CUR_ENVSIZE); + } + rc = flash_read_buf(dev_current, fd, environment.image, CUR_ENVSIZE, DEVOFFSET(dev_current)); if (rc != CUR_ENVSIZE) @@ -1234,7 +1473,8 @@ int fw_env_open(struct env_opts *opts) DEVTYPE(!dev_current) == MTD_UBIVOLUME) { environment.flag_scheme = FLAG_INCREMENTAL; } else if (DEVTYPE(dev_current) == MTD_ABSENT && - DEVTYPE(!dev_current) == MTD_ABSENT) { + DEVTYPE(!dev_current) == MTD_ABSENT && + IS_UBI(dev_current) == IS_UBI(!dev_current)) { environment.flag_scheme = FLAG_INCREMENTAL; } else { fprintf (stderr, "Incompatible flash types!\n"); @@ -1347,8 +1587,12 @@ int fw_env_close(struct env_opts *opts) static int check_device_config(int dev) { struct stat st; + int32_t lnum = 0; int fd, rc = 0; + /* Fills in IS_UBI(), converts DEVNAME() with ubi volume name */ + ubi_check_dev(dev); + fd = open(DEVNAME(dev), O_RDONLY); if (fd < 0) { fprintf(stderr, @@ -1364,7 +1608,14 @@ static int check_device_config(int dev) goto err; } - if (S_ISCHR(st.st_mode)) { + if (IS_UBI(dev)) { + rc = ioctl(fd, UBI_IOCEBISMAP, &lnum); + if (rc < 0) { + fprintf(stderr, "Cannot get UBI information for %s\n", + DEVNAME(dev)); + goto err; + } + } else if (S_ISCHR(st.st_mode)) { struct mtd_info_user mtdinfo; rc = ioctl(fd, MEMGETINFO, &mtdinfo); if (rc < 0) { diff --git a/tools/env/fw_env.config b/tools/env/fw_env.config index 7916ebd..053895a 100644 --- a/tools/env/fw_env.config +++ b/tools/env/fw_env.config @@ -28,3 +28,11 @@ # VFAT example #/boot/uboot.env 0x0000 0x4000 + +# UBI volume +#/dev/ubi0_0 0x0 0x1f000 0x1f000 +#/dev/ubi0_1 0x0 0x1f000 0x1f000 + +# UBI volume by name +#/dev/ubi0:env 0x0 0x1f000 0x1f000 +#/dev/ubi0:env-redund 0x0 0x1f000 0x1f000 -- 1.9.4

3 2

[U-Boot] [PATCH] Convert CONFIG_NAND_OMAP_GPMC et al to Kconfig
by Adam Ford 01 Dec '17

01 Dec '17

This converts the following to Kconfig: CONFIG_NAND_OMAP_GPMC CONFIG_NAND_OMAP_GPMC_PREFETCH CONFIG_NAND_OMAP_ELM CONFIG_SYS_NAND_BUSWIDTH_16BIT CONFIG_SPL_NAND_AM33XX_BCH CONFIG_SPL_NAND_SIMPLE Signed-off-by: Adam Ford <aford173(a)gmail.com> --- README | 4 --- arch/arm/mach-omap2/Kconfig | 18 +++++++++++++ configs/am335x_baltos_defconfig | 2 +- configs/am335x_evm_defconfig | 1 + configs/am335x_evm_nor_defconfig | 1 + configs/am335x_evm_usbspl_defconfig | 1 + configs/am335x_hs_evm_defconfig | 1 + configs/am3517_crane_defconfig | 1 + configs/am3517_evm_defconfig | 2 ++ configs/chiliboard_defconfig | 2 +- configs/devkit8000_defconfig | 1 + configs/eco5pk_defconfig | 2 ++ configs/igep0020_defconfig | 1 + configs/igep0030_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/ipam390_defconfig | 1 + configs/mcx_defconfig | 2 ++ configs/mt_ventoux_defconfig | 2 ++ configs/omap3_beagle_defconfig | 1 + configs/omap3_evm_defconfig | 1 + configs/omap3_ha_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_overo_defconfig | 1 + configs/omap3_pandora_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/omapl138_lcdk_defconfig | 1 + configs/tao3530_defconfig | 1 + configs/ti816x_evm_defconfig | 2 ++ configs/twister_defconfig | 2 ++ drivers/mtd/nand/Kconfig | 47 +++++++++++++++++++++++++++++++++- include/configs/am335x_evm.h | 6 ----- include/configs/am335x_igep003x.h | 1 - include/configs/am3517_crane.h | 3 --- include/configs/am3517_evm.h | 4 --- include/configs/am43xx_evm.h | 5 ---- include/configs/apf27.h | 1 - include/configs/baltos.h | 3 --- include/configs/bav335x.h | 5 ---- include/configs/brppt1.h | 3 --- include/configs/chiliboard.h | 6 ----- include/configs/cm_t35.h | 2 -- include/configs/cm_t3517.h | 1 - include/configs/cm_t43.h | 1 - include/configs/da850evm.h | 1 - include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 1 - include/configs/dra7xx_evm.h | 6 ----- include/configs/ipam390.h | 1 - include/configs/mcx.h | 4 --- include/configs/omap3_beagle.h | 2 -- include/configs/omap3_cairo.h | 1 - include/configs/omap3_evm.h | 3 --- include/configs/omap3_igep00x0.h | 2 -- include/configs/omap3_logic.h | 3 --- include/configs/omap3_overo.h | 1 - include/configs/omap3_pandora.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/omapl138_lcdk.h | 2 -- include/configs/pengwyn.h | 2 -- include/configs/siemens-am33x-common.h | 3 --- include/configs/tam3517-common.h | 4 --- include/configs/tao3530.h | 3 --- include/configs/tegra-common.h | 1 - include/configs/ti816x_evm.h | 5 ---- include/configs/ti_am335x_common.h | 4 --- include/configs/ti_armv7_omap.h | 1 - include/configs/ti_omap3_common.h | 1 - include/configs/ti_omap4_common.h | 4 --- include/configs/ti_omap5_common.h | 4 --- include/configs/tricorder.h | 2 -- scripts/config_whitelist.txt | 5 ---- 71 files changed, 97 insertions(+), 117 deletions(-) diff --git a/README b/README index 3735916..dbbca43 100644 --- a/README +++ b/README @@ -2985,10 +2985,6 @@ FIT uImage format: CONFIG_SPL_NAND_ECC Include standard software ECC in the SPL - CONFIG_SPL_NAND_SIMPLE - Support for NAND boot using simple NAND drivers that - expose the cmd_ctrl() interface. - CONFIG_SPL_UBI Support for a lightweight UBI (fastmap) scanner and loader diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 89c91d1..eb3124f 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -11,6 +11,7 @@ config OMAP34XX select ARM_ERRATA_621766 select ARM_ERRATA_725233 select USE_TINY_PRINTF + imply NAND_OMAP_GPMC imply SPL_EXT_SUPPORT imply SPL_FAT_SUPPORT imply SPL_GPIO_SUPPORT @@ -19,6 +20,7 @@ config OMAP34XX imply SPL_LIBDISK_SUPPORT imply SPL_LIBGENERIC_SUPPORT imply SPL_MMC_SUPPORT + imply SPL_NAND_SIMPLE imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT @@ -29,6 +31,8 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" select USE_TINY_PRINTF + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC imply SPL_DISPLAY_PRINT imply SPL_EXT_SUPPORT imply SPL_FAT_SUPPORT @@ -38,6 +42,7 @@ config OMAP44XX imply SPL_LIBDISK_SUPPORT imply SPL_LIBGENERIC_SUPPORT imply SPL_MMC_SUPPORT + imply SPL_NAND_AM33XX_BCH imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT @@ -48,6 +53,8 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_ERRATA_798870 select SYS_THUMB_BUILD + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC imply SPL_DISPLAY_PRINT imply SPL_ENV_SUPPORT imply SPL_EXT_SUPPORT @@ -58,6 +65,7 @@ config OMAP54XX imply SPL_LIBDISK_SUPPORT imply SPL_LIBGENERIC_SUPPORT imply SPL_MMC_SUPPORT + imply SPL_NAND_AM33XX_BCH imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT @@ -72,6 +80,8 @@ config TI814X config TI816X bool "TI816X SoC" + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC help Support for AM335x SOC from Texas Instruments. The AM335x high performance SOC features a Cortex-A8 @@ -79,8 +89,12 @@ config TI816X config AM43XX bool "AM43XX SoC" + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC imply SPL_DM imply SPL_DM_SEQ_ALIAS + imply SPL_NAND_AM33XX_BCH + imply SPL_NAND_SUPPORT imply SPL_OF_CONTROL imply SPL_OF_TRANSLATE imply SPL_SEPARATE_BSS @@ -96,6 +110,10 @@ config AM43XX config AM33XX bool "AM33XX SoC" + imply NAND_OMAP_ELM + imply NAND_OMAP_GPMC + imply SPL_NAND_AM33XX_BCH + imply SPL_NAND_SUPPORT imply SYS_I2C_OMAP24XX imply SYS_THUMB_BUILD imply USE_TINY_PRINTF diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 180268e..2df7ac7 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -8,7 +8,6 @@ CONFIG_TARGET_AM335X_BALTOS=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y @@ -52,6 +51,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 82d5a97..046ee68 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 3fb220a..6b94f73 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -27,6 +27,7 @@ CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y CONFIG_MTD_NOR_FLASH=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 55c13da..d899d79 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -30,6 +30,7 @@ CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DFU_RAM=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 59306ba..5d88c87 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -37,6 +37,7 @@ CONFIG_DM_I2C=y CONFIG_MISC=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 396aadd..f9bbe0e 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 1d07f1b..4e4aadb 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -37,6 +37,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_UBI=y CONFIG_SPL_PARTITION_UUIDS=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_HOST=y diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index 5257d70..b7e8b0c 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -7,7 +7,6 @@ CONFIG_TARGET_CHILIBOARD=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SPL_FAT_SUPPORT=y @@ -40,6 +39,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_MTDPARTS=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/devkit8000_defconfig b/configs/devkit8000_defconfig index 9afc2ce..897bc80 100644 --- a/configs/devkit8000_defconfig +++ b/configs/devkit8000_defconfig @@ -28,5 +28,6 @@ CONFIG_CMD_MTDPARTS=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 00261dd..f3c16fd 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -25,6 +25,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/igep0020_defconfig b/configs/igep0020_defconfig index 8ca5a84..745d6f6 100644 --- a/configs/igep0020_defconfig +++ b/configs/igep0020_defconfig @@ -37,6 +37,7 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y diff --git a/configs/igep0030_defconfig b/configs/igep0030_defconfig index 8af6dd5..48b80ae 100644 --- a/configs/igep0030_defconfig +++ b/configs/igep0030_defconfig @@ -37,6 +37,7 @@ CONFIG_LED_STATUS_STATE=2 CONFIG_LED_STATUS_BOOT_ENABLE=y CONFIG_LED_STATUS_BOOT=0 CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index dd43330..8ecd6a5 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_NET_RANDOM_ETHADDR=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig index 0337afa..2686e9e 100644 --- a/configs/ipam390_defconfig +++ b/configs/ipam390_defconfig @@ -29,4 +29,5 @@ CONFIG_CMD_PING=y CONFIG_CMD_DIAG=y CONFIG_CMD_UBI=y # CONFIG_MMC is not set +CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 0b65b73..6ed3a1a 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -34,6 +34,8 @@ CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 2a46c19..a387d8b 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -31,6 +31,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index 1a134df..9f20999 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -35,6 +35,7 @@ CONFIG_LED_STATUS_GREEN_ENABLE=y CONFIG_LED_STATUS_GREEN=2 CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 620148c..b34cb28 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -28,6 +28,7 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig index f88c2e1..1672f39 100644 --- a/configs/omap3_ha_defconfig +++ b/configs/omap3_ha_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_MTDPARTS=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 1eb1ff8..959c71f 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -34,6 +34,7 @@ CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP36XX_PINS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y diff --git a/configs/omap3_overo_defconfig b/configs/omap3_overo_defconfig index 1a1dfcf..cc30836 100644 --- a/configs/omap3_overo_defconfig +++ b/configs/omap3_overo_defconfig @@ -41,6 +41,7 @@ CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 8a2e0ae..78a6bb3 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index c6e2924..43bfde5 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -32,6 +32,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index d10c540..f7181b7 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_UBI=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x28000 +CONFIG_SPL_NAND_SIMPLE=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y diff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig index e6c7e60..92b8f34 100644 --- a/configs/tao3530_defconfig +++ b/configs/tao3530_defconfig @@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_MTDPARTS=y CONFIG_MMC_OMAP_HS=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig index 9d4be2a..fe40939 100644 --- a/configs/ti816x_evm_defconfig +++ b/configs/ti816x_evm_defconfig @@ -41,5 +41,7 @@ CONFIG_DM_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_OMAP24XX=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y # CONFIG_USE_PRIVATE_LIBGCC is not set diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 61132ee..e80e055 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -27,6 +27,8 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y +CONFIG_NAND_OMAP_GPMC_PREFETCH=y +CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 3508c62..3a76ebd 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -33,6 +33,34 @@ config NAND_DENALI_SPARE_AREA_SKIP_BYTES of OOB area before last ECC sector data starts. This is potentially used to preserve the bad block marker in the OOB area. +config NAND_OMAP_GPMC + bool "Support OMAP GPMC NAND controller" + depends on ARCH_OMAP2PLUS + help + Enables omap_gpmc.c driver for OMAPx and AMxxxx platforms. + GPMC controller is used for parallel NAND flash devices, and can + do ECC calculation (not ECC error detection) for HAM1, BCH4, BCH8 + and BCH16 ECC algorithms. + +config NAND_OMAP_GPMC_PREFETCH + bool "Enable GPMC Prefetch" + depends on NAND_OMAP_GPMC + help + On OMAP platforms that use the GPMC controller + (CONFIG_NAND_OMAP_GPMC_PREFETCH), this options enables the code that + uses the prefetch mode to speed up read operations. + +config NAND_OMAP_ELM + bool "Enable ELM driver for OMAPxx and AMxx platforms." + depends on NAND_OMAP_GPMC && !OMAP34XX + help + ELM controller is used for ECC error detection (not ECC calculation) + of BCH4, BCH8 and BCH16 ECC algorithms. + Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine, + thus such SoC platforms need to depend on software library for ECC error + detection. However ECC calculation on such plaforms would still be + done by GPMC controller. + config NAND_VF610_NFC bool "Support for Freescale NFC for VF610" select SYS_NAND_SELF_INIT @@ -124,7 +152,7 @@ comment "Generic NAND options" # option (mxc_nand, ndfc, omap_gpmc). config SYS_NAND_BUSWIDTH_16BIT bool "Use 16-bit NAND interface" - depends on NAND_VF610_NFC + depends on NAND_VF610_NFC || NAND_OMAP_GPMC help Indicates that NAND device has 16-bit wide data-bus. In absence of this config, bus-width of NAND device is assumed to be either 8-bit and later @@ -165,12 +193,29 @@ config SYS_NAND_U_BOOT_OFFS_REDUND Set the offset from the start of the nand where the redundant u-boot should be loaded from. +config SPL_NAND_AM33XX_BCH + bool "Enables SPL-NAND driver which supports ELM based" + depends on NAND_OMAP_GPMC && !OMAP34XX + default y + help + Hardware ECC correction. This is useful for platforms which have ELM + hardware engine and use NAND boot mode. + Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine, + so those platforms should use CONFIG_SPL_NAND_SIMPLE for enabling + SPL-NAND driver with software ECC correction support. + config SPL_NAND_DENALI bool "Support Denali NAND controller for SPL" help This is a small implementation of the Denali NAND controller for use on SPL. +config SPL_NAND_SIMPLE + bool "Use simple SPL NAND driver" + depends on !SPL_NAND_AM33XX_BCH + help + Support for NAND boot using simple NAND drivers that + expose the cmd_ctrl() interface. endif endmenu diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index fbab610..19f66af 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -204,9 +204,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ @@ -234,9 +231,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ diff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h index 3d3d5e7..6bf24a6 100644 --- a/include/configs/am335x_igep003x.h +++ b/include/configs/am335x_igep003x.h @@ -114,7 +114,6 @@ #define CONFIG_PHY_SMSC /* NAND support */ -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION 1 #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index aeba61e..7289fa4 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -212,7 +212,6 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_NAND_OMAP_GPMC #define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB sector */ @@ -243,7 +242,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) @@ -260,7 +258,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 60460c8..65b6af3 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -104,8 +104,6 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_BCH #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ @@ -114,7 +112,6 @@ /* nand at CS0 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 @@ -291,7 +288,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 4f3b605..4076cb2 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -259,8 +259,6 @@ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH16_CODE_HW #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS @@ -302,9 +300,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00180000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00100000 /* os parameters */ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 29cbbab..7e9d9c9 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -208,7 +208,6 @@ #define CONFIG_MXC_NAND_HWECC #define CONFIG_SYS_NAND_LARGEPAGE -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) #define CONFIG_SYS_NAND_PAGE_COUNT CONFIG_SYS_NAND_BLOCK_SIZE / \ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 598352b..f5c22da 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -246,9 +246,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 6beb347..6817fab 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -357,8 +357,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { \ 2, 3, 4, 5, 6, 7, 8, 9, \ @@ -391,9 +389,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_ENV_OFFSET_REDUND 0x001e0000 #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os parameters */ #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */ diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 9688c4a..6620c9d 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -73,7 +73,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* OMAP4 and later ELM support */ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -186,9 +185,7 @@ MMCARGS */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_BASE 0x8000000 -#define CONFIG_NAND_OMAP_GPMC /* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */ -#define CONFIG_NAND_OMAP_ELM #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 581ab7c..5d2bb98 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -139,9 +139,6 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ @@ -169,9 +166,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* USB configuration */ #define CONFIG_USB_MUSB_DSPS diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index f8f3c92..b3f5283 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -106,7 +106,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -252,7 +251,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 5821183..6eb413d 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -109,7 +109,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 4c261f8..cc1453a 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -26,7 +26,6 @@ /* NAND support */ #define CONFIG_NAND -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 695f3f6..7c348f0 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -200,7 +200,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 6124867..8bb813f 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -183,7 +183,6 @@ /* SPL will use serial */ /* SPL loads an image from NAND */ -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_RAW_ONLY #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 5b249d1..8af6f17 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -191,7 +191,6 @@ #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/ /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 1a58c6e..c8b70a7 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -171,13 +171,10 @@ #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_5_ADDR_CYCLE /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS @@ -204,9 +201,6 @@ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 /* NAND: SPL related configs */ -#ifdef CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_AM33XX_BCH -#endif /* NAND: SPL falcon mode configs */ #ifdef CONFIG_SPL_OS_BOOT #define CONFIG_CMD_SPL_NAND_OFS 0x00080000 /* os-boot params*/ diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index a21261f..2ac8b0f 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -176,7 +176,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD /* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index f255334..a0d8bb6 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -250,9 +250,6 @@ /* **** PISMO SUPPORT *** */ #define CONFIG_NAND -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */ /* Redundant Environment */ @@ -280,7 +277,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index a87a75e..5c53351 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -80,7 +80,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ @@ -261,7 +260,6 @@ #define CONFIG_SPL_OMAP3_ID_NAND /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 4f8ce54..069a9bc 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -61,7 +61,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index bc859c8..a021da8 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -53,7 +53,6 @@ /* #define CONFIG_USB_MUSB_UDC */ /* NAND SPL */ -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -169,7 +168,6 @@ /* Max number of NAND devices */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Timeout values (in ticks) */ #define CONFIG_SYS_FLASH_ERASE_TOUT (100 * CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_WRITE_TOUT (100 * CONFIG_SYS_HZ) @@ -249,7 +247,6 @@ #if defined(CONFIG_CMD_NAND) #define CONFIG_SYS_FLASH_BASE NAND_BASE -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_ENV_OFFSET SMNAND_ENV_OFFSET #elif defined(CONFIG_CMD_ONENAND) #define CONFIG_SYS_FLASH_BASE ONENAND_MAP diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 39f1e54..1182cf5 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -98,7 +98,6 @@ /* NAND config */ #define CONFIG_SPL_OMAP3_ID_NAND -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 @@ -115,7 +114,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 14 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_BCH /* UBI configuration */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index e5ffb85..be7e458 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -71,13 +71,10 @@ /* Board NAND Info. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC - #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of */ /* NAND devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index bc4a59e..d7999a9 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -196,7 +196,6 @@ #define CONFIG_SYS_INIT_RAM_SIZE 0x800 /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_MAX_ECCPOS 56 #define CONFIG_SYS_NAND_5_ADDR_CYCLE #define CONFIG_SYS_NAND_PAGE_COUNT 64 diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 53c53ef..9c98091 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -49,7 +49,6 @@ */ #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index 7f4f56f..67df5d7 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ /* to access nand at */ /* CS0 */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Environment information */ diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 08e7deb..b7934d9 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -160,7 +160,6 @@ #define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST #define CONFIG_SYS_NAND_PAGE_2K -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_CS 3 #define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE #define CONFIG_SYS_NAND_MASK_CLE 0x10 @@ -192,7 +191,6 @@ #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_LOAD #endif diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index a76bbce..4e098b8 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -114,8 +114,6 @@ /* SPL */ /* NAND support */ -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM /* NAND Configuration. */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 5101d70..be88d84 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -122,7 +122,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -#define CONFIG_SPL_NAND_AM33XX_BCH #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS #define CONFIG_SPL_NAND_ECC @@ -516,8 +515,6 @@ "512k(mtdoops)," \ "-(configuration)" -#define CONFIG_NAND_OMAP_GPMC -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BASE (0x08000000) /* physical address */ /* to access nand at */ /* CS0 */ diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 37f8767..cb6c16b 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -131,7 +131,6 @@ /* **** PISMO SUPPORT *** */ #define CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC #define SMNAND_ENV_OFFSET 0x180000 /* environment starts here */ /* Redundant Environment */ @@ -164,7 +163,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_CONSOLE -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_SOFTECC #define CONFIG_SPL_NAND_WORKSPACE 0x8f07f000 /* below BSS */ @@ -196,7 +194,6 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */ /* NAND boot config */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT 64 #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 @@ -209,7 +206,6 @@ #define CONFIG_SYS_NAND_ECCSIZE 256 #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW -#define CONFIG_NAND_OMAP_GPMC_PREFETCH #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 1f36ac6..80a1932 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -81,7 +81,6 @@ /* * Board NAND Info. */ -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -90,7 +89,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */ /* devices */ -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT /* Environment information */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -233,7 +231,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 723435e..ca9bef3 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -89,7 +89,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_TEXT_BASE - \ CONFIG_SPL_TEXT_BASE) #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000 diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index bba10ec..f6218d2 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -68,19 +68,15 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 /* NAND: SPL related configs */ -#define CONFIG_SPL_NAND_AM33XX_BCH /* NAND: device related configs */ #define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_BUSWIDTH_16BIT #define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ CONFIG_SYS_NAND_PAGE_SIZE) #define CONFIG_SYS_NAND_PAGE_SIZE 2048 #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) /* NAND: driver related configs */ -#define CONFIG_NAND_OMAP_GPMC_PREFETCH -#define CONFIG_NAND_OMAP_ELM #define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS #define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ 10, 11, 12, 13, 14, 15, 16, 17, \ @@ -113,7 +109,6 @@ /* SPL */ /* Defines for SPL */ -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ #define CONFIG_SPL_TEXT_BASE 0x40400000 #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ CONFIG_SPL_TEXT_BASE) diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index bf44121..66cacdf 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -74,10 +74,6 @@ * s_init when we have SPL used. */ -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - /* Now bring in the rest of the common code. */ #include <configs/ti_armv7_omap.h> diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index 6834500..cf696ff 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -24,7 +24,6 @@ * access CS0 at is 0x8000000. */ #ifdef CONFIG_NAND -#define CONFIG_NAND_OMAP_GPMC #ifndef CONFIG_SYS_NAND_BASE #define CONFIG_SYS_NAND_BASE 0x8000000 #endif diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h index 393d867..2373727 100644 --- a/include/configs/ti_omap3_common.h +++ b/include/configs/ti_omap3_common.h @@ -65,7 +65,6 @@ (64 << 20)) #ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SYS_NAND_BASE 0x30000000 #endif diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index acfac24..dbf3478 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -143,10 +143,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - #ifdef CONFIG_SPL_BUILD /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */ #undef CONFIG_SYS_I2C diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 4c3a276..e892073 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -104,10 +104,6 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ (128 << 20)) -#ifdef CONFIG_NAND -#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ -#endif - #ifdef CONFIG_SPL_BUILD #undef CONFIG_TIMER #endif diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index fbdd43a..87c2f90 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -84,7 +84,6 @@ "2m(fdt)," \ "-(ubi)" -#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE /* physical address */ /* to access nand */ #define CONFIG_SYS_NAND_BASE NAND_BASE /* physical address */ @@ -254,7 +253,6 @@ /* Defines for SPL */ #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_NAND_BASE #define CONFIG_SPL_NAND_DRIVERS diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4689d63..d42e839 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1620,9 +1620,6 @@ CONFIG_NAND_MXC CONFIG_NAND_MXC_V1_1 CONFIG_NAND_NDFC CONFIG_NAND_OMAP_ECCSCHEME -CONFIG_NAND_OMAP_ELM -CONFIG_NAND_OMAP_GPMC -CONFIG_NAND_OMAP_GPMC_PREFETCH CONFIG_NAND_OMAP_GPMC_WSCFG CONFIG_NAND_SECBOOT CONFIG_NAND_SPL @@ -2254,7 +2251,6 @@ CONFIG_SPL_MMC_LOAD CONFIG_SPL_MMC_MINIMAL CONFIG_SPL_MPC83XX_WAIT_FOR_NAND CONFIG_SPL_MXS_PSWITCH_WAIT -CONFIG_SPL_NAND_AM33XX_BCH CONFIG_SPL_NAND_BASE CONFIG_SPL_NAND_BOOT CONFIG_SPL_NAND_DRIVERS @@ -2263,7 +2259,6 @@ CONFIG_SPL_NAND_INIT CONFIG_SPL_NAND_LOAD CONFIG_SPL_NAND_MINIMAL CONFIG_SPL_NAND_RAW_ONLY -CONFIG_SPL_NAND_SIMPLE CONFIG_SPL_NAND_SOFTECC CONFIG_SPL_NAND_WORKSPACE CONFIG_SPL_NO_CPU_SUPPORT_CODE -- 2.7.4

3 2

[U-Boot] [PATCH RFC] arm64: allwinner: a64: Add Brava Keller initial support
by Jagan Teki 01 Dec '17

01 Dec '17

Brava Keller is A64 based IoT device, which support - Allwinner A64 Cortex-A53 - AXP803 PMIC - 1GB DDR3 RAM - 8GB eMMC - Mali-400MP2 GPU - AP6330 Wifi/BLE - Camera OV5640 - USB Host and OTG Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- Note: Need to test it on hardware arch/arm/dts/Makefile | 1 + arch/arm/dts/sun50i-a64-brava-keller.dts | 107 +++++++++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 ++ configs/brava_keller_defconfig | 13 ++++ 4 files changed, 126 insertions(+) create mode 100644 arch/arm/dts/sun50i-a64-brava-keller.dts create mode 100644 configs/brava_keller_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index cd540e9..b89e75a 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -342,6 +342,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \ sun50i-h5-orangepi-zero-plus2.dtb dtb-$(CONFIG_MACH_SUN50I) += \ sun50i-a64-bananapi-m64.dtb \ + sun50i-a64-brava-keller.dtb \ sun50i-a64-nanopi-a64.dtb \ sun50i-a64-olinuxino.dtb \ sun50i-a64-orangepi-win.dtb \ diff --git a/arch/arm/dts/sun50i-a64-brava-keller.dts b/arch/arm/dts/sun50i-a64-brava-keller.dts new file mode 100644 index 0000000..094eee0 --- /dev/null +++ b/arch/arm/dts/sun50i-a64-brava-keller.dts @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2017 Jagan Teki <jagan(a)amarulasolutions.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; + +#include "sun50i-a64.dtsi" + +#include <dt-bindings/gpio/gpio.h> + +/ { + model = "Brava Keller"; + compatible = "brava,brava-keller", "allwinner,sun50i-a64"; + + aliases { + serial2 = &uart2; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + reg_vcc3v3: vcc3v3 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; + +&ehci0 { + status = "okay"; +}; + +&ehci1 { + status = "okay"; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; + vmmc-supply = <&reg_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins>; + status = "okay"; +}; + +&usb_otg { + status = "okay"; +}; + +&usbphy { + status = "okay"; +}; diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 99809c6..a6222ba 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -143,6 +143,11 @@ M: Jagan Teki <jagan(a)amarulasolutions.com> S: Maintained F: configs/bananapi_m64_defconfig +BRAVA KELLER +M: Jagan Teki <jagan(a)amarulasolutions.com> +S: Maintained +F: configs/brava_keller_defconfig + COLOMBUS BOARD M: Maxime Ripard <maxime.ripard(a)free-electrons.com> S: Maintained diff --git a/configs/brava_keller_defconfig b/configs/brava_keller_defconfig new file mode 100644 index 0000000..67dea1c --- /dev/null +++ b/configs/brava_keller_defconfig @@ -0,0 +1,13 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN50I=y +CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-brava-keller" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set -- 2.7.4

2 1

[U-Boot] [PATCH 1/2] armv8: ls1043a: modify the detecting way to cover all variants
by Wenbin song 01 Dec '17

01 Dec '17

There are many variants for ls1043a. Modify the detecting way to make that the below fixup apply to all variants of ls1043a. - Fix GIC offset for rev1.1 - Fix msi node for rev1.1 - erratum_a010151 Signed-off-by: Wenbin Song <wenbin.song(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 4 ++-- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 5 ++--- arch/arm/include/asm/arch-fsl-layerscape/soc.h | 3 +++ drivers/usb/common/fsl-errata.c | 7 +++++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index d6794708c9..33f3e64848 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -147,7 +147,7 @@ static void fdt_fixup_gic(void *blob) val = gur_in32(&gur->svr); - if (SVR_SOC_VER(val) != SVR_LS1043A) { + if (!IS_SVR_DEV(val, SVR_DEV_LS1043A)) { align_64k = 1; } else if (SVR_REV(val) != REV1_0) { val = scfg_in32(&scfg->gic_align) & (0x01 << GIC_ADDR_BIT); @@ -329,7 +329,7 @@ static void fdt_fixup_msi(void *blob) rev = gur_in32(&gur->svr); - if (SVR_SOC_VER(rev) != SVR_LS1043A) + if (!IS_SVR_DEV(rev, SVR_DEV_LS1043A)) return; rev = SVR_REV(rev); diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index 28a31b21a9..666e842b99 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -37,9 +37,8 @@ ENTRY(get_gic_offset) ldr x2, =DCFG_CCSR_SVR ldr w2, [x2] rev w2, w2 - mov w3, w2 - ands w3, w3, #SVR_WO_E << 8 - mov w4, #SVR_LS1043A << 8 + lsr w3, w2, #16 + ldr w4, =SVR_DEV_LS1043A cmp w3, w4 b.ne 1f ands w2, w2, #0xff diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index 08a42b9c9e..7c189530c1 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -73,6 +73,7 @@ struct cpu_type { #define SVR_LS2041A 0x870914 #define SVR_DEV_LS2080A 0x8701 +#define SVR_DEV_LS1043A 0x8792 #define SVR_MAJ(svr) (((svr) >> 4) & 0xf) #define SVR_MIN(svr) (((svr) >> 0) & 0xf) @@ -81,6 +82,8 @@ struct cpu_type { #define IS_E_PROCESSOR(svr) (!((svr >> 8) & 0x1)) #define IS_SVR_REV(svr, maj, min) \ ((SVR_MAJ(svr) == (maj)) && (SVR_MIN(svr) == (min))) +#define IS_SVR_DEV(svr, dev) \ + (((svr) >> 16) == (dev)) /* ahci port register default value */ #define AHCI_PORT_PHY_1_CFG 0xa003fffe diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c index 823beb32f6..c20c9a3567 100644 --- a/drivers/usb/common/fsl-errata.c +++ b/drivers/usb/common/fsl-errata.c @@ -198,6 +198,11 @@ bool has_erratum_a010151(void) u32 svr = get_svr(); u32 soc = SVR_SOC_VER(svr); +#ifdef CONFIG_ARM64 + if (IS_SVR_DEV(svr, SVR_DEV_LS1043A)) + return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); +#endif + switch (soc) { #ifdef CONFIG_ARM64 case SVR_LS2080A: @@ -209,8 +214,6 @@ bool has_erratum_a010151(void) case SVR_LS1046A: case SVR_LS1012A: return IS_SVR_REV(svr, 1, 0); - case SVR_LS1043A: - return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); #endif #ifdef CONFIG_ARCH_LS1021A case SOC_VER_LS1020: -- 2.14.1

4 5

[U-Boot] [PATCH] x86: Add 'imply SCSI' to boards using AHCI_PCI
by Tuomas Tynkkynen 01 Dec '17

01 Dec '17

The qemu and coreboot boards have 'imply AHCI_PCI' but no 'imply SCSI', i.e. they are enabling the driver for the Serial ATA controller but (AFAICT) have no way of accessing those devices from the prompt. In fact, without this patch I get a silent U-Boot crash when I add a SATA device to QEMU with the following options: -drive if=none,file=mydisk.qcow2,id=root -device ich9-ahci,id=ahci -device ide-drive,drive=root,bus=ahci.0 With the 'imply SCSI' added, U-Boot doesn't crash and the drive is found when 'scsi scan' is run. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi> --- Hi Bin, Simon Does this make sense? I was working on converting drivers/ata to Kconfig, which includes CONFIG_SCSI_AHCI (used by x86) but noticed these boards that currently have {SCSI=n, AHCI_PCI=y, SCSI_AHCI=y}. --- arch/x86/cpu/coreboot/Kconfig | 1 + arch/x86/cpu/qemu/Kconfig | 1 + 2 files changed, 2 insertions(+) diff --git arch/x86/cpu/coreboot/Kconfig arch/x86/cpu/coreboot/Kconfig index 60eb45f9d0..0e83a43d99 100644 --- arch/x86/cpu/coreboot/Kconfig +++ arch/x86/cpu/coreboot/Kconfig @@ -10,6 +10,7 @@ config SYS_COREBOOT imply MMC_PCI imply MMC_SDHCI imply MMC_SDHCI_SDMA + imply SCSI imply SPI_FLASH imply SYS_NS16550 imply USB diff --git arch/x86/cpu/qemu/Kconfig arch/x86/cpu/qemu/Kconfig index 81444f3d9e..a0090281b9 100644 --- arch/x86/cpu/qemu/Kconfig +++ arch/x86/cpu/qemu/Kconfig @@ -9,6 +9,7 @@ config QEMU select ARCH_EARLY_INIT_R imply AHCI_PCI imply E1000 + imply SCSI imply SYS_NS16550 imply USB imply USB_EHCI_HCD -- 2.15.0

2 1

[U-Boot] [PATCH] MAINTAINERS: git-mailrc: Update the maintainer for rmobile
by Nobuhiro Iwamatsu 01 Dec '17

01 Dec '17

Adding Marek Vasut to MAINTAINERS and git-mailrc for the Renesas ARM rmobile architecture. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- doc/git-mailrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index 5a365cddd9..f2fc6d4c5e 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -66,7 +66,7 @@ alias imx uboot, sbabic alias kirkwood uboot, prafulla, luka alias omap ti alias pxa uboot, marex -alias rmobile uboot, iwamatsu +alias rmobile uboot, iwamatsu, marex alias s3c samsung alias s5pc samsung alias samsung uboot, prom -- 2.15.0

1 0

[U-Boot] [PATCH v2 1/3] ARM: rmobile: Use CONFIG_SYS_BOARD instaed of CONFIG_ARCH_RMOBILE_BOARD_STRING
by Nobuhiro Iwamatsu 01 Dec '17

01 Dec '17

CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as CONFIG_ARCH_RMOBILE_BOARD_STRING provided in <BOARD_NAME>.h. This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- v2: rebase. board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +- board/kmc/kzm9g/kzm9g.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/stout.c | 2 +- include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/silk.h | 1 - include/configs/stout.h | 1 - scripts/config_whitelist.txt | 1 - 21 files changed, 10 insertions(+), 21 deletions(-) diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index abe69abcc8..dcb5c78f55 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -315,7 +315,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; int board_late_init(void) diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c index a284721cfd..679dff7084 100644 --- a/board/kmc/kzm9g/kzm9g.c +++ b/board/kmc/kzm9g/kzm9g.c @@ -349,7 +349,7 @@ int board_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; int dram_init(void) diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 0bf8160f1f..a4e3cccf78 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -217,7 +217,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 574dcda01b..434544d90f 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -468,7 +468,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 54e126985b..465be87c01 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -201,7 +201,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 8fa648e40a..45a422044b 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 562be04760..04343a9be6 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -235,7 +235,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index 5b1a167906..711baf04c5 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD, }; void reset_cpu(ulong addr) diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index a8de402d20..30be941a44 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -192,7 +192,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index d681148273..39fefe7fc9 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -217,7 +217,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; static const struct sh_serial_platdata serial_platdata = { diff --git a/include/configs/alt.h b/include/configs/alt.h index 35518da625..4021910bb3 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt" #include "rcar-gen2-common.h" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 66ae76b2d2..135619ef31 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7740 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n" #define CONFIG_SH_GPIO_PFC #include <asm/arch/rmobile.h> diff --git a/include/configs/blanche.h b/include/configs/blanche.h index ce7c716465..7f9cc71af3 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7792 -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" #include "rcar-gen2-common.h" diff --git a/include/configs/gose.h b/include/configs/gose.h index 610ba1a7ac..c94f7bf252 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7793 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose" #include "rcar-gen2-common.h" diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index b9214d2f34..a0cab809b1 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch" #include "rcar-gen2-common.h" diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 16f37a016d..4eb90db7f2 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -12,7 +12,6 @@ #define CONFIG_SH73A0 #define CONFIG_KZM_A9_GT -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT" #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G #include <asm/arch/rmobile.h> diff --git a/include/configs/lager.h b/include/configs/lager.h index 291b03c50b..162828b787 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager" #include "rcar-gen2-common.h" diff --git a/include/configs/porter.h b/include/configs/porter.h index 451d9dd66f..a479566146 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -13,7 +13,6 @@ #undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter" #include "rcar-gen2-common.h" diff --git a/include/configs/silk.h b/include/configs/silk.h index 0384325cb5..60a51dc282 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -13,7 +13,6 @@ #undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk" #include "rcar-gen2-common.h" diff --git a/include/configs/stout.h b/include/configs/stout.h index 9422c042f3..b5de336aa1 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -14,7 +14,6 @@ #undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout" #include "rcar-gen2-common.h" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c2fe81e552..1a9403a8d1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -57,7 +57,6 @@ CONFIG_ARCH_ORION5X CONFIG_ARCH_PLEB CONFIG_ARCH_PXA_CERF CONFIG_ARCH_PXA_IDP -CONFIG_ARCH_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_TEGRA CONFIG_ARCH_USE_BUILTIN_BSWAP -- 2.15.0

1 2

[U-Boot] [PATCH 1/3] ARM: rmobile: Use CONFIG_SYS_BOARD instaed of CONFIG_ARCH_RMOBILE_BOARD_STRING
by Nobuhiro Iwamatsu 01 Dec '17

01 Dec '17

CONFIG_SYS_BOARD is provided by Kconfig, this has the same value as CONFIG_ARCH_RMOBILE_BOARD_STRING provided in <BOARD_NAME>.h. This switches from CONFIG_ARCH_RMOBILE_BOARD_STRING to CONFIG_SYS_BOARD. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +- board/kmc/kzm9g/kzm9g.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/salvator-x/salvator-x.c | 2 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/stout.c | 2 +- board/renesas/ulcb/ulcb.c | 2 +- include/configs/alt.h | 1 - include/configs/armadillo-800eva.h | 1 - include/configs/blanche.h | 1 - include/configs/gose.h | 1 - include/configs/koelsch.h | 1 - include/configs/kzm9g.h | 1 - include/configs/lager.h | 1 - include/configs/porter.h | 1 - include/configs/salvator-x.h | 2 -- include/configs/silk.h | 1 - include/configs/stout.h | 1 - include/configs/ulcb.h | 2 -- scripts/config_whitelist.txt | 1 - 25 files changed, 12 insertions(+), 27 deletions(-) diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index abe69abcc8..dcb5c78f55 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -315,7 +315,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; int board_late_init(void) diff --git a/board/kmc/kzm9g/kzm9g.c b/board/kmc/kzm9g/kzm9g.c index a284721cfd..679dff7084 100644 --- a/board/kmc/kzm9g/kzm9g.c +++ b/board/kmc/kzm9g/kzm9g.c @@ -349,7 +349,7 @@ int board_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; int dram_init(void) diff --git a/board/renesas/alt/alt.c b/board/renesas/alt/alt.c index 0bf8160f1f..a4e3cccf78 100644 --- a/board/renesas/alt/alt.c +++ b/board/renesas/alt/alt.c @@ -217,7 +217,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c index 574dcda01b..434544d90f 100644 --- a/board/renesas/blanche/blanche.c +++ b/board/renesas/blanche/blanche.c @@ -468,7 +468,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 54e126985b..465be87c01 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -201,7 +201,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/koelsch/koelsch.c b/board/renesas/koelsch/koelsch.c index 8fa648e40a..45a422044b 100644 --- a/board/renesas/koelsch/koelsch.c +++ b/board/renesas/koelsch/koelsch.c @@ -222,7 +222,7 @@ int board_phy_config(struct phy_device *phydev) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c index 562be04760..04343a9be6 100644 --- a/board/renesas/lager/lager.c +++ b/board/renesas/lager/lager.c @@ -235,7 +235,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c index 5b1a167906..711baf04c5 100644 --- a/board/renesas/porter/porter.c +++ b/board/renesas/porter/porter.c @@ -203,7 +203,7 @@ int board_phy_config(struct phy_device *phydev) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD, }; void reset_cpu(ulong addr) diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index debd1db721..34cc9018dd 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -141,7 +141,7 @@ int dram_init_banksize(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RCAR_BOARD_STRING + CONFIG_SYS_BOARD }; #define RST_BASE 0xE6160000 diff --git a/board/renesas/silk/silk.c b/board/renesas/silk/silk.c index a8de402d20..30be941a44 100644 --- a/board/renesas/silk/silk.c +++ b/board/renesas/silk/silk.c @@ -192,7 +192,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; void reset_cpu(ulong addr) diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c index d681148273..39fefe7fc9 100644 --- a/board/renesas/stout/stout.c +++ b/board/renesas/stout/stout.c @@ -217,7 +217,7 @@ int dram_init(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_ARCH_RMOBILE_BOARD_STRING + CONFIG_SYS_BOARD }; static const struct sh_serial_platdata serial_platdata = { diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index ca1b71975b..f78241a268 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -131,5 +131,5 @@ int dram_init_banksize(void) } const struct rmobile_sysinfo sysinfo = { - CONFIG_RCAR_BOARD_STRING + CONFIG_SYS_BOARD }; diff --git a/include/configs/alt.h b/include/configs/alt.h index 35518da625..4021910bb3 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Alt" #include "rcar-gen2-common.h" diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 66ae76b2d2..135619ef31 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7740 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Armadillo-800EVA Board\n" #define CONFIG_SH_GPIO_PFC #include <asm/arch/rmobile.h> diff --git a/include/configs/blanche.h b/include/configs/blanche.h index ce7c716465..7f9cc71af3 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7792 -#define CONFIG_RMOBILE_BOARD_STRING "Blanche" #include "rcar-gen2-common.h" diff --git a/include/configs/gose.h b/include/configs/gose.h index 610ba1a7ac..c94f7bf252 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7793 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Gose" #include "rcar-gen2-common.h" diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index b9214d2f34..a0cab809b1 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -11,7 +11,6 @@ #undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Koelsch" #include "rcar-gen2-common.h" diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 16f37a016d..4eb90db7f2 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -12,7 +12,6 @@ #define CONFIG_SH73A0 #define CONFIG_KZM_A9_GT -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "KMC KZM-A9-GT" #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G #include <asm/arch/rmobile.h> diff --git a/include/configs/lager.h b/include/configs/lager.h index 291b03c50b..162828b787 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -12,7 +12,6 @@ #undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Lager" #include "rcar-gen2-common.h" diff --git a/include/configs/porter.h b/include/configs/porter.h index 451d9dd66f..a479566146 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -13,7 +13,6 @@ #undef DEBUG #define CONFIG_R8A7791 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Porter" #include "rcar-gen2-common.h" diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 77a12de963..0b154c13f5 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -12,8 +12,6 @@ #undef DEBUG -#define CONFIG_RCAR_BOARD_STRING "Salvator-X" - #include "rcar-gen3-common.h" /* SCIF */ diff --git a/include/configs/silk.h b/include/configs/silk.h index 0384325cb5..60a51dc282 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -13,7 +13,6 @@ #undef DEBUG #define CONFIG_R8A7794 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Silk" #include "rcar-gen2-common.h" diff --git a/include/configs/stout.h b/include/configs/stout.h index 9422c042f3..b5de336aa1 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -14,7 +14,6 @@ #undef DEBUG #define CONFIG_R8A7790 -#define CONFIG_ARCH_RMOBILE_BOARD_STRING "Stout" #include "rcar-gen2-common.h" diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index b54e63c2a2..30c284bd0c 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -12,8 +12,6 @@ #undef DEBUG -#define CONFIG_RCAR_BOARD_STRING "ULCB" - #include "rcar-gen3-common.h" /* M3 ULCB has 2 banks, each with 1 GiB of RAM */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 402f5c04f7..52e7691c5d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -57,7 +57,6 @@ CONFIG_ARCH_ORION5X CONFIG_ARCH_PLEB CONFIG_ARCH_PXA_CERF CONFIG_ARCH_PXA_IDP -CONFIG_ARCH_RMOBILE_BOARD_STRING CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_TEGRA CONFIG_ARCH_USE_BUILTIN_BSWAP -- 2.15.0

1 3