Re: [U-Boot] [PATCH 2/2] mx6cuboxi: Add support for sata
On Mon, May 15, 2017 at 06:24:46PM +0100, Peter Robinson wrote: > The Cubox-i and Hummingboard series of devices have an option of > SATA on board, and depending on how the fuses are blown even the > option to boot SPL from SATA. So enable support for it so it can > be used to boot the OS from if people desire. > > Signed-off-by: Peter Robinson> --- > board/solidrun/mx6cuboxi/mx6cuboxi.c | 7 +++ > configs/mx6cuboxi_defconfig | 23 --- > include/configs/mx6cuboxi.h | 11 +++ > 3 files changed, 30 insertions(+), 11 deletions(-) > > diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c > b/board/solidrun/mx6cuboxi/mx6cuboxi.c > index 285588d80a..59a78dfa6a 100644 > --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c > +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -314,6 +315,12 @@ int board_early_init_f(void) > ret = setup_display(); > #endif > > +#ifdef CONFIG_CMD_SATA > + /* Only mx6q/mx6q has SATA */ > + if (is_mx6dq()) > + setup_sata(); Comment was intended to be mx6d/mx6q? Though the test here may not be needed as setup_sata() returns early if not available. And mx6cuboxi.c wouldn't need to be updated here if a i.MX 6DualPlus or i.MX 6QuadPlus board from SolidRun shows up at some point in the future. u-boot/arch/arm/imx-common/sata.c int setup_sata(void) { struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR; int ret; if (!is_mx6dq() && !is_mx6dqp()) return 1; > +#endif > + > #ifdef CONFIG_USB_EHCI_MX6 > setup_usb(); > #endif > diff --git a/configs/mx6cuboxi_defconfig b/configs/mx6cuboxi_defconfig > index c34beb74e2..ca5f5189f6 100644 > --- a/configs/mx6cuboxi_defconfig > +++ b/configs/mx6cuboxi_defconfig > @@ -1,30 +1,31 @@ > CONFIG_ARM=y > CONFIG_ARCH_MX6=y > +CONFIG_TARGET_MX6CUBOXI=y > +CONFIG_SPL=y > +CONFIG_SPL_EXT_SUPPORT=y > CONFIG_SPL_GPIO_SUPPORT=y > +CONFIG_SPL_I2C_SUPPORT=y > CONFIG_SPL_LIBCOMMON_SUPPORT=y > +CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_SPL_LIBGENERIC_SUPPORT=y > -CONFIG_TARGET_MX6CUBOXI=y > CONFIG_SPL_MMC_SUPPORT=y > +# CONFIG_SPL_PARTITION_UUIDS is not set > CONFIG_SPL_SERIAL_SUPPORT=y > -CONFIG_SPL_LIBDISK_SUPPORT=y > CONFIG_SPL_WATCHDOG_SUPPORT=y > -# CONFIG_CMD_BMODE is not set > CONFIG_VIDEO=y > CONFIG_DISTRO_DEFAULTS=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" > # CONFIG_SYS_STDIO_DEREGISTER is not set > CONFIG_BOARD_EARLY_INIT_F=y > -CONFIG_SPL=y > -CONFIG_SPL_EXT_SUPPORT=y > -CONFIG_SPL_I2C_SUPPORT=y > -# CONFIG_CMD_IMLS is not set > +# CONFIG_CMD_BMODE is not set > +CONFIG_CMD_CACHE=y > +CONFIG_CMD_EXT4_WRITE=y > # CONFIG_CMD_FLASH is not set > +CONFIG_CMD_GPIO=y > +# CONFIG_CMD_IMLS is not set > CONFIG_CMD_MMC=y > +CONFIG_CMD_SATA=y > CONFIG_CMD_USB=y > -CONFIG_CMD_GPIO=y > -CONFIG_CMD_CACHE=y > -CONFIG_CMD_EXT4_WRITE=y > -# CONFIG_SPL_PARTITION_UUIDS is not set > CONFIG_DM=y > CONFIG_DM_THERMAL=y > CONFIG_USB=y > diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h > index 84fdf656cd..be071769fc 100644 > --- a/include/configs/mx6cuboxi.h > +++ b/include/configs/mx6cuboxi.h > @@ -21,6 +21,16 @@ > /* MMC Configs */ > #define CONFIG_SYS_FSL_ESDHC_ADDRUSDHC2_BASE_ADDR > > +/* SATA Configuration */ > +#ifdef CONFIG_CMD_SATA > +#define CONFIG_DWC_AHSATA > +#define CONFIG_SYS_SATA_MAX_DEVICE 1 > +#define CONFIG_DWC_AHSATA_PORT_ID 0 > +#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR > +#define CONFIG_LBA48 > +#define CONFIG_LIBATA > +#endif > + > /* Ethernet Configuration */ > #define CONFIG_FEC_MXC > #define CONFIG_MII > @@ -119,6 +129,7 @@ > > #define BOOT_TARGET_DEVICES(func) \ > func(MMC, mmc, 0) \ > + func(SATA, sata, 0) \ > func(USB, usb, 0) \ > func(PXE, pxe, na) \ > func(DHCP, dhcp, na) > -- > 2.13.0 > > ___ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH] ARM: uniphier: move kernel physical base to 0x82080000
Reserve enough space below the kernel base. The assumed address map is: 8000 - 80ff : for IPP 8100 - 81ff : for ARM secure 8200 - : for Linux Signed-off-by: Masahiro Yamada--- include/configs/uniphier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 7bd2d8c..6271b07 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -176,7 +176,7 @@ #define CONFIG_BOOTFILE"Image.gz" #define LINUXBOOT_CMD "booti" #define KERNEL_ADDR_LOAD "kernel_addr_load=0x8420\0" -#define KERNEL_ADDR_R "kernel_addr_r=0x8008\0" +#define KERNEL_ADDR_R "kernel_addr_r=0x8208\0" #else #define CONFIG_BOOTFILE"zImage" #define LINUXBOOT_CMD "bootz" -- 2.7.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 6/6] moveconfig: Support looking for implied CONFIG options
Hello Simon, Am 15.05.2017 um 13:47 schrieb Simon Glass: Some CONFIG options can be implied by others and this can help to reduce the size of the defconfig files. For example, CONFIG_X86 implies CONFIG_CMD_IRQ, so we can put 'imply CMD_IRQ' under 'config X86' and all x86 boards will have that option, avoiding adding CONFIG_CMD_IRQ to each of the x86 defconfig files. Add a -i option which searches for such options. Signed-off-by: Simon Glass--- tools/moveconfig.py | 215 +++- 1 file changed, 214 insertions(+), 1 deletion(-) Thanks! Reviewed-by: Heiko Schocher bye, Heiko diff --git a/tools/moveconfig.py b/tools/moveconfig.py index ed576f4b83..f33203d51b 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -128,6 +128,69 @@ To process CONFIG_CMD_FPGAD only for a subset of configs based on path match: ./tools/moveconfig.py -Cy CONFIG_CMD_FPGAD -d - +Finding implied CONFIGs +--- + +Some CONFIG options can be implied by others and this can help to reduce +the size of the defconfig files. For example, CONFIG_X86 implies +CONFIG_CMD_IRQ, so we can put 'imply CMD_IRQ' under 'config X86' and +all x86 boards will have that option, avoiding adding CONFIG_CMD_IRQ to +each of the x86 defconfig files. + +This tool can help find such configs. To use it, first build a database: + +./tools/moveconfig.py -b + +Then try to query it: + +./tools/moveconfig.py -i CONFIG_CMD_IRQ +CONFIG_CMD_IRQ found in 311/2384 defconfigs +44 : CONFIG_SYS_FSL_ERRATUM_IFC_A002769 +41 : CONFIG_SYS_FSL_ERRATUM_A007075 +31 : CONFIG_SYS_FSL_DDR_VER_44 +28 : CONFIG_ARCH_P1010 +28 : CONFIG_SYS_FSL_ERRATUM_P1010_A003549 +28 : CONFIG_SYS_FSL_ERRATUM_SEC_A003571 +28 : CONFIG_SYS_FSL_ERRATUM_IFC_A003399 +25 : CONFIG_SYS_FSL_ERRATUM_A008044 +22 : CONFIG_ARCH_P1020 +21 : CONFIG_SYS_FSL_DDR_VER_46 +20 : CONFIG_MAX_PIRQ_LINKS +20 : CONFIG_HPET_ADDRESS +20 : CONFIG_X86 +20 : CONFIG_PCIE_ECAM_SIZE +20 : CONFIG_IRQ_SLOT_COUNT +20 : CONFIG_I8259_PIC +20 : CONFIG_CPU_ADDR_BITS +20 : CONFIG_RAMBASE +20 : CONFIG_SYS_FSL_ERRATUM_A005871 +20 : CONFIG_PCIE_ECAM_BASE +20 : CONFIG_X86_TSC_TIMER +20 : CONFIG_I8254_TIMER +20 : CONFIG_CMD_GETTIME +19 : CONFIG_SYS_FSL_ERRATUM_A005812 +18 : CONFIG_X86_RUN_32BIT +17 : CONFIG_CMD_CHIP_CONFIG +... + +This shows a list of config options which might imply CONFIG_CMD_EEPROM along +with how many defconfigs they cover. From this you can see that CONFIG_X86 +implies CONFIG_CMD_EEPROM. Therefore, instead of adding CONFIG_CMD_EEPROM to +the defconfig of every x86 board, you could add a single imply line to the +Kconfig file: + +config X86 +bool "x86 architecture" +... +imply CMD_EEPROM + +That will cover 20 defconfigs. Many of the options listed are not suitable as +they are not related. E.g. it would be odd for CONFIG_CMD_GETTIME to imply +CMD_EEPROM. + +Using this search you can reduce the size of moveconfig patches. + + Available options - @@ -191,6 +254,7 @@ To see the complete list of supported options, run """ +import collections import copy import difflib import filecmp @@ -1395,6 +1459,148 @@ def move_config(configs, options, db_queue): slots.show_failed_boards() slots.show_suspicious_boards() +def imply_config(config_list, find_superset=False): +"""Find CONFIG options which imply those in the list + +Some CONFIG options can be implied by others and this can help to reduce +the size of the defconfig files. For example, CONFIG_X86 implies +CONFIG_CMD_IRQ, so we can put 'imply CMD_IRQ' under 'config X86' and +all x86 boards will have that option, avoiding adding CONFIG_CMD_IRQ to +each of the x86 defconfig files. + +This function uses the moveconfig database to find such options. It +displays a list of things that could possibly imply those in the list. +The algorithm ignores any that start with CONFIG_TARGET since these +typically refer to only a few defconfigs (often one). It also does not +display a config with less than 5 defconfigs. + +The algorithm works using sets. For each target config in config_list: +- Get the set 'defconfigs' which use that target config +- For each config (from a list of all configs): +- Get the set 'imply_defconfig' of defconfigs which use that config +- +- If imply_defconfigs contains anything not in defconfigs then + this config does not imply the target config + +Params: +config_list: List of CONFIG options to check (each a string) +find_superset: True to look for configs which are a superset of those +already found. So for example if CONFIG_EXYNOS5 implies an option, +but CONFIG_EXYNOS covers a larger set of
Re: [U-Boot] [PATCH 11/47] Kconfig: Drop CONFIG_SYS_I2C_DS4510_ADDR
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This is only used by one board and always set to 0x51. Drop this option. Signed-off-by: Simon Glass--- drivers/misc/ds4510.c | 7 +-- include/configs/xpedite517x.h | 3 --- include/configs/xpedite537x.h | 3 --- scripts/config_whitelist.txt | 1 - 4 files changed, 1 insertion(+), 13 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 9ffdafc992..55f8936513 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -14,11 +14,6 @@ #include #include "ds4510.h" -/* Default to an address that hopefully won't corrupt other i2c devices */ -#ifndef CONFIG_SYS_I2C_DS4510_ADDR -#define CONFIG_SYS_I2C_DS4510_ADDR (~0) -#endif - enum { DS4510_CMD_INFO, DS4510_CMD_DEVICE, @@ -254,7 +249,7 @@ cmd_tbl_t cmd_ds4510[] = { int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - static uint8_t chip = CONFIG_SYS_I2C_DS4510_ADDR; + static uint8_t chip = 0x51; cmd_tbl_t *c; ulong ul_arg2 = 0; ulong ul_arg3 = 0; diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 94aad2519e..cf84e1f99a 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -234,9 +234,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 2000 -/* GPIO/EEPROM/SRAM */ -#define CONFIG_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 826cd9aa5f..d630f2a9c9 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -232,9 +232,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_I2C_RTC_ADDR 0x68 #define CONFIG_SYS_M41T11_BASE_YEAR 2000 -/* GPIO/EEPROM/SRAM */ -#define CONFIG_SYS_I2C_DS4510_ADDR 0x51 - /* GPIO */ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR0 0x18 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index be3d68979c..66b6d1eace 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4203,7 +4203,6 @@ CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DPMEM_OFFSET -CONFIG_SYS_I2C_DS4510_ADDR CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR CONFIG_SYS_I2C_DSPIC_IO_ADDR -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 10/47] Kconfig: Drop CONFIG_SYS_I2C_DS1621_ADDR
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: Now that dtt is gone, this is not used. Drop it. Signed-off-by: Simon Glass--- include/configs/xpedite517x.h | 12 include/configs/xpedite537x.h | 11 --- scripts/config_whitelist.txt | 1 - 3 files changed, 24 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 97a9d71e8b..94aad2519e 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -87,17 +87,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_MEMTEST_END0x2000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY |\ CONFIG_SYS_POST_I2C) -#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR,\ -CONFIG_SYS_I2C_DS4510_ADDR,\ -CONFIG_SYS_I2C_EEPROM_ADDR,\ -CONFIG_SYS_I2C_LM90_ADDR, \ -CONFIG_SYS_I2C_PCA9553_ADDR, \ -CONFIG_SYS_I2C_PCA953X_ADDR0, \ -CONFIG_SYS_I2C_PCA953X_ADDR1, \ -CONFIG_SYS_I2C_PCA953X_ADDR2, \ -CONFIG_SYS_I2C_PCA953X_ADDR3, \ -CONFIG_SYS_I2C_PEX8518_ADDR, \ -CONFIG_SYS_I2C_RTC_ADDR} /* The XPedite5170 can host an XMC which has an EEPROM at address 0x50 */ #define I2C_ADDR_IGNORE_LIST {0x50} @@ -232,7 +221,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 /* I2C DS1631 temperature sensor */ -#define CONFIG_SYS_I2C_DS1621_ADDR 0x48 #define CONFIG_SYS_I2C_LM90_ADDR 0x4c /* I2C EEPROM - AT24C128B */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index fa1971db20..826cd9aa5f 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -81,16 +81,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_MEMTEST_END0x2000 #define CONFIG_POST (CONFIG_SYS_POST_MEMORY | \ CONFIG_SYS_POST_I2C) -#define I2C_ADDR_LIST {CONFIG_SYS_I2C_DS1621_ADDR,\ -CONFIG_SYS_I2C_DS4510_ADDR,\ -CONFIG_SYS_I2C_EEPROM_ADDR,\ -CONFIG_SYS_I2C_LM90_ADDR, \ -CONFIG_SYS_I2C_PCA953X_ADDR0, \ -CONFIG_SYS_I2C_PCA953X_ADDR1, \ -CONFIG_SYS_I2C_PCA953X_ADDR2, \ -CONFIG_SYS_I2C_PCA953X_ADDR3, \ -CONFIG_SYS_I2C_PEX8518_ADDR, \ -CONFIG_SYS_I2C_RTC_ADDR} /* The XPedite5370 can host an XMC which has an EEPROM at address 0x50 */ #define I2C_ADDR_IGNORE_LIST {0x50} @@ -229,7 +219,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_I2C_PEX8518_ADDR 0x70 /* I2C DS1631 temperature sensor */ -#define CONFIG_SYS_I2C_DS1621_ADDR 0x48 #define CONFIG_SYS_I2C_LM90_ADDR 0x4c /* I2C EEPROM - AT24C128B */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ecd76042c5..be3d68979c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4203,7 +4203,6 @@ CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DPMEM_OFFSET -CONFIG_SYS_I2C_DS1621_ADDR CONFIG_SYS_I2C_DS4510_ADDR CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 07/47] Kconfig: Drop CONFIG_SYS_I2C_DTT_ADDR
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This option is only defined to a non-default value by canyonlands, which needs conversion to driver model (where the I2C address would be defined by the device tree). Drop this option. Signed-off-by: Simon Glass--- README| 6 -- drivers/hwmon/ds1775.c| 2 +- drivers/hwmon/lm75.c | 4 include/configs/canyonlands.h | 4 include/configs/kilauea.h | 1 - include/configs/makalu.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 1 insertion(+), 18 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/README b/README index ace492edde..0e6ed53736 100644 --- a/README +++ b/README @@ -2391,12 +2391,6 @@ The following options need to be configured: If defined, then this indicates the I2C bus number for the DTT. If not defined, then U-Boot assumes that DTT is on I2C bus 0. - CONFIG_SYS_I2C_DTT_ADDR: - - If defined, specifies the I2C address of the DTT device. - If not defined, then U-Boot uses predefined value for - specified DTT device. - CONFIG_SOFT_I2C_READ_REPEATED_START defining this will force the i2c_read() function in diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c index b95b130d92..4c0c0b82a0 100644 --- a/drivers/hwmon/ds1775.c +++ b/drivers/hwmon/ds1775.c @@ -11,7 +11,7 @@ #include #include -#define DTT_I2C_DEV_CODE CONFIG_SYS_I2C_DTT_ADDR /* Dallas Semi's DS1775 device code */ +#define DTT_I2C_DEV_CODE 0x48 /* Dallas Semi's DS1775 device code */ #define DTT_READ_TEMP 0x0 #define DTT_CONFIG0x1 #define DTT_TEMP_HYST 0x2 diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 462f902dad..aafa4757b1 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -16,11 +16,7 @@ /* * Device code */ -#if defined(CONFIG_SYS_I2C_DTT_ADDR) -#define DTT_I2C_DEV_CODE CONFIG_SYS_I2C_DTT_ADDR -#else #define DTT_I2C_DEV_CODE 0x48 /* ON Semi's LM75 device */ -#endif #define DTT_READ_TEMP 0x0 #define DTT_CONFIG0x1 #define DTT_TEMP_HYST 0x2 diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index a330372d19..ea440d6e16 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -269,10 +269,6 @@ #define CONFIG_SYS_DTT_LOW_TEMP -30 #define CONFIG_SYS_DTT_HYSTERESIS 3 -#if defined(CONFIG_ARCHES) -#define CONFIG_SYS_I2C_DTT_ADDR0x4a/* AD7414 I2C address */ -#endif - #if !defined(CONFIG_ARCHES) /* RTC configuration */ #define CONFIG_RTC_M41T62 diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 1f5c2ad234..b8c0d0d8f0 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -320,7 +320,6 @@ /* Standard DTT sensor configuration */ #define CONFIG_DTT_DS1775 1 #define CONFIG_DTT_SENSORS{ 0 } -#define CONFIG_SYS_I2C_DTT_ADDR0x48 /* RTC configuration */ #define CONFIG_RTC_DS1338 1 diff --git a/include/configs/makalu.h b/include/configs/makalu.h index da5cfa19d3..cdb02f3693 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -192,7 +192,6 @@ /* Standard DTT sensor configuration */ #define CONFIG_DTT_DS1775 1 #define CONFIG_DTT_SENSORS{ 0 } -#define CONFIG_SYS_I2C_DTT_ADDR0x48 /* RTC configuration */ #define CONFIG_RTC_X1205 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 85ab8f8933..e39fa2520e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4232,7 +4232,6 @@ CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR CONFIG_SYS_I2C_DSPIC_IO_ADDR CONFIG_SYS_I2C_DSPIC_KEYB_ADDR -CONFIG_SYS_I2C_DTT_ADDR CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_BUS_NUM CONFIG_SYS_I2C_EARLY_INIT -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 09/47] Drop digital thermometer and thermostat (DTT) drivers
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This subsystem is quite old. It has been replaced with a driver-model version (UCLASS_THERMAL). Boards are free to convert to that if required, but here is a removal patch that could be applied in the meantime. Signed-off-by: Simon Glass--- README | 6 -- board/gdsys/405ep/dlvision-10g.c | 10 ++- board/gdsys/405ep/io.c | 10 ++- board/gdsys/405ep/neo.c| 10 ++- board/gdsys/405ex/io64.c | 10 ++- cmd/Makefile | 1 - cmd/dtt.c | 120 --- drivers/Kconfig| 2 - drivers/Makefile | 1 - drivers/hwmon/Kconfig | 0 drivers/hwmon/Makefile | 22 - drivers/hwmon/adm1021.c| 164 - drivers/hwmon/adt7460.c| 73 - drivers/hwmon/ds1621.c | 155 --- drivers/hwmon/ds1722.c | 137 --- drivers/hwmon/ds1775.c | 126 drivers/hwmon/ds620.c | 65 --- drivers/hwmon/lm63.c | 160 drivers/hwmon/lm73.c | 146 - drivers/hwmon/lm75.c | 139 --- drivers/hwmon/lm81.c | 111 - include/config_cmd_all.h | 1 - include/configs/PMC440.h | 21 - include/configs/TQM834x.h | 8 -- include/configs/UCP1020.h | 21 - include/configs/acadia.h | 9 -- include/configs/canyonlands.h | 11 --- include/configs/dlvision-10g.h | 8 -- include/configs/dlvision.h | 1 - include/configs/exynos5-common.h | 2 - include/configs/intip.h| 8 -- include/configs/io.h | 6 -- include/configs/io64.h | 9 -- include/configs/katmai.h | 25 -- include/configs/kilauea.h | 4 - include/configs/km/km-powerpc.h| 1 - include/configs/km/km83xx-common.h | 7 -- include/configs/km82xx.h | 7 -- include/configs/makalu.h | 5 -- include/configs/motionpro.h| 3 - include/configs/neo.h | 8 -- include/configs/odroid_xu3.h | 1 - include/configs/sequoia.h | 9 -- include/configs/socrates.h | 8 -- include/configs/tqma6.h| 10 --- include/configs/tqma6_mba6.h | 2 - include/configs/tqma6_wru4.h | 4 - include/configs/work_92105.h | 8 -- include/configs/xilinx-ppc.h | 1 - include/configs/xpedite517x.h | 3 - include/configs/xpedite537x.h | 3 - include/configs/xpedite550x.h | 3 - include/configs/yosemite.h | 9 -- include/dtt.h | 47 --- include/i2c.h | 3 - scripts/config_whitelist.txt | 22 - 56 files changed, 28 insertions(+), 1738 deletions(-) delete mode 100644 cmd/dtt.c delete mode 100644 drivers/hwmon/Kconfig delete mode 100644 drivers/hwmon/Makefile delete mode 100644 drivers/hwmon/adm1021.c delete mode 100644 drivers/hwmon/adt7460.c delete mode 100644 drivers/hwmon/ds1621.c delete mode 100644 drivers/hwmon/ds1722.c delete mode 100644 drivers/hwmon/ds1775.c delete mode 100644 drivers/hwmon/ds620.c delete mode 100644 drivers/hwmon/lm63.c delete mode 100644 drivers/hwmon/lm73.c delete mode 100644 drivers/hwmon/lm75.c delete mode 100644 drivers/hwmon/lm81.c delete mode 100644 include/dtt.h Reviewed-by: Heiko Schocher bye, Heiko diff --git a/README b/README index 0e6ed53736..0380ce2027 100644 --- a/README +++ b/README @@ -830,7 +830,6 @@ The following options need to be configured: CONFIG_CMD_CRC32* crc32 CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENVedit env variable CONFIG_CMD_EEPROM * EEPROM read/write support @@ -2386,11 +2385,6 @@ The following options need to be configured: If defined, then this indicates the I2C bus number for the RTC. If not defined, then U-Boot assumes that RTC is on I2C bus 0. - CONFIG_SYS_DTT_BUS_NUM - - If defined, then this indicates the I2C bus number for the DTT. - If not defined, then U-Boot assumes that DTT is on I2C bus 0. - CONFIG_SOFT_I2C_READ_REPEATED_START defining this will force
Re: [U-Boot] [PATCH 05/47] Kconfig: Drop CONFIG_CMD_DS4510
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This option enables a command in the driver. But the functions defined by the driver are not called anywhere else in U-Boot. So it does not seem useful to have this driver without its commands. Drop this option, move the header file out of the common include/ directory and make all the function static. Signed-off-by: Simon Glass--- drivers/misc/ds4510.c | 22 ++ {include => drivers/misc}/ds4510.h | 10 -- include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 10 insertions(+), 25 deletions(-) rename {include => drivers/misc}/ds4510.h (75%) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index c08a0bee63..9ffdafc992 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include "ds4510.h" /* Default to an address that hopefully won't corrupt other i2c devices */ #ifndef CONFIG_SYS_I2C_DS4510_ADDR @@ -35,7 +35,7 @@ enum { /* * Write to DS4510, taking page boundaries into account */ -int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) +static int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) { int wrlen; int i = 0; @@ -64,7 +64,7 @@ int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count) /* * General read from DS4510 */ -int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) +static int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) { return i2c_read(chip, offset, 1, buf, count); } @@ -74,7 +74,7 @@ int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count) * nv = 0 - Writes to SEEPROM registers behave like EEPROM * nv = 1 - Writes to SEEPROM registers behave like SRAM */ -int ds4510_see_write(uint8_t chip, uint8_t nv) +static int ds4510_see_write(uint8_t chip, uint8_t nv) { uint8_t data; @@ -92,7 +92,7 @@ int ds4510_see_write(uint8_t chip, uint8_t nv) /* * Write de-assertion of reset signal delay */ -int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) +static int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) { uint8_t data; @@ -108,7 +108,7 @@ int ds4510_rstdelay_write(uint8_t chip, uint8_t delay) /* * Write pullup characteristics of IO pins */ -int ds4510_pullup_write(uint8_t chip, uint8_t val) +static int ds4510_pullup_write(uint8_t chip, uint8_t val) { val &= DS4510_IO_MASK; @@ -118,7 +118,7 @@ int ds4510_pullup_write(uint8_t chip, uint8_t val) /* * Read pullup characteristics of IO pins */ -int ds4510_pullup_read(uint8_t chip) +static int ds4510_pullup_read(uint8_t chip) { uint8_t val; @@ -131,7 +131,7 @@ int ds4510_pullup_read(uint8_t chip) /* * Write drive level of IO pins */ -int ds4510_gpio_write(uint8_t chip, uint8_t val) +static int ds4510_gpio_write(uint8_t chip, uint8_t val) { uint8_t data; int i; @@ -155,7 +155,7 @@ int ds4510_gpio_write(uint8_t chip, uint8_t val) /* * Read drive level of IO pins */ -int ds4510_gpio_read(uint8_t chip) +static int ds4510_gpio_read(uint8_t chip) { uint8_t data; int val = 0; @@ -175,7 +175,7 @@ int ds4510_gpio_read(uint8_t chip) /* * Read physical level of IO pins */ -int ds4510_gpio_read_val(uint8_t chip) +static int ds4510_gpio_read_val(uint8_t chip) { uint8_t val; @@ -185,7 +185,6 @@ int ds4510_gpio_read_val(uint8_t chip) return val & DS4510_IO_MASK; } -#ifdef CONFIG_CMD_DS4510 /* * Display DS4510 information */ @@ -384,4 +383,3 @@ U_BOOT_CMD( "ds4510 sram write addr off cnt\n" " - read/write 'cnt' bytes at SRAM offset 'off'" ); -#endif /* CONFIG_CMD_DS4510 */ diff --git a/include/ds4510.h b/drivers/misc/ds4510.h similarity index 75% rename from include/ds4510.h rename to drivers/misc/ds4510.h index e54db35265..a6c6c58cc4 100644 --- a/include/ds4510.h +++ b/drivers/misc/ds4510.h @@ -50,14 +50,4 @@ #define DS4510_SRAM 0xfa #define DS4510_SRAM_SIZE 0x06 -int ds4510_mem_write(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_mem_read(uint8_t chip, int offset, uint8_t *buf, int count); -int ds4510_see_write(uint8_t chip, uint8_t nv); -int ds4510_rstdelay_write(uint8_t chip, uint8_t delay); -int ds4510_pullup_write(uint8_t chip, uint8_t val); -int ds4510_pullup_read(uint8_t chip); -int ds4510_gpio_write(uint8_t chip, uint8_t val); -int ds4510_gpio_read(uint8_t chip); -int ds4510_gpio_read_val(uint8_t chip); - #endif /* __DS4510_H_ */ diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index dae61b11e4..822f70e7ac 100644 --- a/include/configs/xpedite517x.h +++
Re: [U-Boot] [PATCH 06/47] Convert CONFIG_DS4510 to Kconfig
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This converts the following to Kconfig: CONFIG_DS4510 Signed-off-by: Simon Glass--- README| 1 - configs/xpedite517x_defconfig | 1 + configs/xpedite537x_defconfig | 1 + drivers/misc/Kconfig | 8 include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 7 files changed, 10 insertions(+), 4 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/README b/README index c3f4824f64..ace492edde 100644 --- a/README +++ b/README @@ -830,7 +830,6 @@ The following options need to be configured: CONFIG_CMD_CRC32* crc32 CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics - CONFIG_CMD_DS4510 * ds4510 I2C gpio commands CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENVedit env variable diff --git a/configs/xpedite517x_defconfig b/configs/xpedite517x_defconfig index 909efb1c08..69fd8fa004 100644 --- a/configs/xpedite517x_defconfig +++ b/configs/xpedite517x_defconfig @@ -15,6 +15,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y +CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig index 41dee5d839..641ef8ff09 100644 --- a/configs/xpedite537x_defconfig +++ b/configs/xpedite537x_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_SNTP=y CONFIG_CMD_DATE=y CONFIG_SYS_FSL_DDR2=y +CONFIG_DS4510=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 1aae4bcd07..ecca159d14 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -75,6 +75,14 @@ config CROS_EC_SPI provides a faster and more robust interface than I2C but the bugs are less interesting. +config DS4510 + bool "Enable support for DS4510 CPU supervisor" + help + Enable support for the Maxim DS4510 CPU supervisor. It has an + integrated 64-byte EEPROM, four programmable non-volatile I/O pins + and a configurable timer for the supervisor function. The device is + connected over I2C. + config FSL_SEC_MON bool "Enable FSL SEC_MON Driver" help diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 822f70e7ac..bd1d0c75d9 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -249,7 +249,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_M41T11_BASE_YEAR 2000 /* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 #define CONFIG_SYS_I2C_DS4510_ADDR0x51 /* GPIO */ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index a12a3f8347..a290cf3463 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -246,7 +246,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_SYS_M41T11_BASE_YEAR 2000 /* GPIO/EEPROM/SRAM */ -#define CONFIG_DS4510 #define CONFIG_SYS_I2C_DS4510_ADDR0x51 /* GPIO */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3332fe3cac..85ab8f8933 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -683,7 +683,6 @@ CONFIG_DRIVE_MMC CONFIG_DRIVE_SATA CONFIG_DRIVE_TYPES CONFIG_DRIVE_USB -CONFIG_DS4510 CONFIG_DSP_CLUSTER_START CONFIG_DTT CONFIG_DTT_AD7414 -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 04/47] Kconfig: Drop CONFIG_CMD_DS4510_RST
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This option is only used in one driver and is not enabled by any board. It does not seem worth having the ability to remove this part of the support. Drop the option. Signed-off-by: Simon Glass--- README | 1 - drivers/misc/ds4510.c| 6 -- scripts/config_whitelist.txt | 1 - 3 files changed, 8 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/README b/README index 965fc9c7eb..c3f4824f64 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments CONFIG_CMD_EDITENVedit env variable diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 936fb3ead4..c08a0bee63 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -247,9 +247,7 @@ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(input, 3, 0, (void *)DS4510_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(pullup, 4, 0, (void *)DS4510_CMD_PULLUP, "", ""), U_BOOT_CMD_MKENT(info, 2, 0, (void *)DS4510_CMD_INFO, "", ""), -#ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), -#endif U_BOOT_CMD_MKENT(eeprom, 6, 0, (void *)DS4510_CMD_EEPROM, "", ""), U_BOOT_CMD_MKENT(seeprom, 6, 0, (void *)DS4510_CMD_SEEPROM, "", ""), U_BOOT_CMD_MKENT(sram, 6, 0, (void *)DS4510_CMD_SRAM, "", ""), @@ -318,10 +316,8 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return ds4510_pullup_write(chip, tmp); case DS4510_CMD_INFO: return ds4510_info(chip); -#ifdef CONFIG_CMD_DS4510_RST case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); -#endif case DS4510_CMD_EEPROM: end = DS4510_EEPROM + DS4510_EEPROM_SIZE; off = DS4510_EEPROM; @@ -374,11 +370,9 @@ U_BOOT_CMD( " - disable/enable pullup on specified pin\n" "ds4510 nv 0|1\n" " - make gpio and seeprom writes volatile/non-volatile" -#ifdef CONFIG_CMD_DS4510_RST "\n" "ds4510 rstdelay 0-3\n" " - set reset output delay" -#endif "\n" "ds4510 eeprom read addr off cnt\n" "ds4510 eeprom write addr off cnt\n" diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5e3cd98d44..17f241720a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -385,7 +385,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT CONFIG_CMD_ECCTEST CONFIG_CMD_EECONFIG -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 03/47] Kconfig: Drop CONFIG_CMD_DS4510_MEM
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This option is only used in one driver and is not enabled by any board. It does not seem worth having the ability to remove this part of the support. Drop the option. Signed-off-by: Simon Glass--- README | 1 - drivers/misc/ds4510.c| 10 -- scripts/config_whitelist.txt | 1 - 3 files changed, 12 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/README b/README index 3c4f0165b1..965fc9c7eb 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_MEM * ds4510 I2C eeprom/sram commansd CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat CONFIG_CMD_ECHO echo arguments diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index 940e2ce6a0..936fb3ead4 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -250,11 +250,9 @@ cmd_tbl_t cmd_ds4510[] = { #ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), #endif -#ifdef CONFIG_CMD_DS4510_MEM U_BOOT_CMD_MKENT(eeprom, 6, 0, (void *)DS4510_CMD_EEPROM, "", ""), U_BOOT_CMD_MKENT(seeprom, 6, 0, (void *)DS4510_CMD_SEEPROM, "", ""), U_BOOT_CMD_MKENT(sram, 6, 0, (void *)DS4510_CMD_SRAM, "", ""), -#endif }; int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -264,13 +262,11 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong ul_arg2 = 0; ulong ul_arg3 = 0; int tmp; -#ifdef CONFIG_CMD_DS4510_MEM ulong addr; ulong off; ulong cnt; int end; int (*rw_func)(uint8_t, int, uint8_t *, int); -#endif c = find_cmd_tbl(argv[1], cmd_ds4510, ARRAY_SIZE(cmd_ds4510)); @@ -326,7 +322,6 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); #endif -#ifdef CONFIG_CMD_DS4510_MEM case DS4510_CMD_EEPROM: end = DS4510_EEPROM + DS4510_EEPROM_SIZE; off = DS4510_EEPROM; @@ -339,13 +334,11 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) end = DS4510_SRAM + DS4510_SRAM_SIZE; off = DS4510_SRAM; break; -#endif default: /* We should never get here... */ return 1; } -#ifdef CONFIG_CMD_DS4510_MEM /* Only eeprom, seeprom, and sram commands should make it here */ if (strcmp(argv[2], "read") == 0) rw_func = ds4510_mem_read; @@ -364,7 +357,6 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } return rw_func(chip, off, (uint8_t *)addr, cnt); -#endif } U_BOOT_CMD( @@ -387,7 +379,6 @@ U_BOOT_CMD( "ds4510 rstdelay 0-3\n" " - set reset output delay" #endif -#ifdef CONFIG_CMD_DS4510_MEM "\n" "ds4510 eeprom read addr off cnt\n" "ds4510 eeprom write addr off cnt\n" @@ -398,6 +389,5 @@ U_BOOT_CMD( "ds4510 sram read addr off cnt\n" "ds4510 sram write addr off cnt\n" " - read/write 'cnt' bytes at SRAM offset 'off'" -#endif ); #endif /* CONFIG_CMD_DS4510 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b4c3d6b311..5e3cd98d44 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -385,7 +385,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_MEM CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT CONFIG_CMD_ECCTEST -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 02/47] Kconfig: Drop CONFIG_CMD_DS4510_INFO
Hello Simon, Am 15.05.2017 um 12:57 schrieb Simon Glass: This option is only used in one driver and two boards. It does not seem worth having the ability to remove this part of the support. Drop the option. Signed-off-by: Simon Glass--- README| 1 - drivers/misc/ds4510.c | 8 include/configs/xpedite517x.h | 1 - include/configs/xpedite537x.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 12 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko diff --git a/README b/README index 2ca0102b57..3c4f0165b1 100644 --- a/README +++ b/README @@ -831,7 +831,6 @@ The following options need to be configured: CONFIG_CMD_DHCP * DHCP support CONFIG_CMD_DIAG * Diagnostics CONFIG_CMD_DS4510 * ds4510 I2C gpio commands - CONFIG_CMD_DS4510_INFO * ds4510 I2C info command CONFIG_CMD_DS4510_MEM * ds4510 I2C eeprom/sram commansd CONFIG_CMD_DS4510_RST * ds4510 I2C rst command CONFIG_CMD_DTT * Digital Therm and Thermostat diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c index d7c9bd73c8..940e2ce6a0 100644 --- a/drivers/misc/ds4510.c +++ b/drivers/misc/ds4510.c @@ -186,7 +186,6 @@ int ds4510_gpio_read_val(uint8_t chip) } #ifdef CONFIG_CMD_DS4510 -#ifdef CONFIG_CMD_DS4510_INFO /* * Display DS4510 information */ @@ -240,7 +239,6 @@ static int ds4510_info(uint8_t chip) return 0; } -#endif /* CONFIG_CMD_DS4510_INFO */ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)DS4510_CMD_DEVICE, "", ""), @@ -248,9 +246,7 @@ cmd_tbl_t cmd_ds4510[] = { U_BOOT_CMD_MKENT(output, 4, 0, (void *)DS4510_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)DS4510_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(pullup, 4, 0, (void *)DS4510_CMD_PULLUP, "", ""), -#ifdef CONFIG_CMD_DS4510_INFO U_BOOT_CMD_MKENT(info, 2, 0, (void *)DS4510_CMD_INFO, "", ""), -#endif #ifdef CONFIG_CMD_DS4510_RST U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""), #endif @@ -324,10 +320,8 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) else tmp &= ~(1 << ul_arg2); return ds4510_pullup_write(chip, tmp); -#ifdef CONFIG_CMD_DS4510_INFO case DS4510_CMD_INFO: return ds4510_info(chip); -#endif #ifdef CONFIG_CMD_DS4510_RST case DS4510_CMD_RSTDELAY: return ds4510_rstdelay_write(chip, ul_arg2); @@ -378,10 +372,8 @@ U_BOOT_CMD( "ds4510 eeprom/seeprom/sram/gpio access", "device [dev]\n" " - show or set current device address\n" -#ifdef CONFIG_CMD_DS4510_INFO "ds4510 info\n" " - display ds4510 info\n" -#endif "ds4510 output pin 0|1\n" " - set pin low or high-Z\n" "ds4510 input pin\n" diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 447fd9557a..dae61b11e4 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -503,7 +503,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_DS4510 -#define CONFIG_CMD_DS4510_INFO #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_IRQ diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 48f07b08c0..ce1ff86135 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -355,7 +355,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); * Command configuration. */ #define CONFIG_CMD_DS4510 -#define CONFIG_CMD_DS4510_INFO #define CONFIG_CMD_DTT #define CONFIG_CMD_EEPROM #define CONFIG_CMD_JFFS2 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 7646bb6842..b4c3d6b311 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -385,7 +385,6 @@ CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_INFO CONFIG_CMD_DS4510_MEM CONFIG_CMD_DS4510_RST CONFIG_CMD_DTT -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] at91_udc.c: Fix unused variable warning
Hello Tom, Marek, Am 19.04.2017 um 04:23 schrieb Tom Rini: With gcc-6 and later we see warnings that at91sam9263_udc_caps and at91rm9200_udc_caps are unused. Fixes: 620197670a69 ("usb: gadget: at91_udc: add at91_udc into U-Boot") Cc: Lukasz MajewskiCc: Marek Vasut Signed-off-by: Tom Rini --- drivers/usb/gadget/at91_udc.c | 10 -- 1 file changed, 10 deletions(-) Acked-by: Heiko Schocher bye, Heiko diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index f5bc277fa6e0..01a59078b84a 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -1386,11 +1386,6 @@ static void at91rm9200_udc_pullup(struct at91_udc *udc, int is_on) gpio_set_value(udc->board.pullup_pin, !active); } -static const struct at91_udc_caps at91rm9200_udc_caps = { - .init = at91rm9200_udc_init, - .pullup = at91rm9200_udc_pullup, -}; - static int at91sam9260_udc_init(struct at91_udc *udc) { struct at91_ep *ep; @@ -1503,11 +1498,6 @@ static int at91sam9263_udc_init(struct at91_udc *udc) return 0; } -static const struct at91_udc_caps at91sam9263_udc_caps = { - .init = at91sam9263_udc_init, - .pullup = at91sam9260_udc_pullup, -}; - int usb_gadget_handle_interrupts(int index) { struct at91_udc *udc = controller; -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 1/1] net: core: avoid possible NULL pointer dereference
Checking if dev is NULL after dereferencing it does not make sense. Signed-off-by: Heinrich Schuchardt--- net/eth-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index c3cc3152a2..b659961a5d 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -181,7 +181,7 @@ int eth_get_dev_index(void) static int eth_write_hwaddr(struct udevice *dev) { - struct eth_pdata *pdata = dev->platdata; + struct eth_pdata *pdata; int ret = 0; if (!dev || !device_active(dev)) @@ -189,6 +189,7 @@ static int eth_write_hwaddr(struct udevice *dev) /* seq is valid since the device is active */ if (eth_get_ops(dev)->write_hwaddr && !eth_mac_skip(dev->seq)) { + pdata = dev->platdata; if (!is_valid_ethaddr(pdata->enetaddr)) { printf("\nError: %s address %pM illegal value\n", dev->name, pdata->enetaddr); -- 2.11.0 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/3] armv8: layerscape: Adjust memory mapping for Flash/SD card on LS1043A
On 04/27/2017 01:08 AM, Alison Wang wrote: > This patch is to adjust the memory mapping for FLash/SD card on > LS1043AQDS and LS1043ARDB, such as PPA firmware load address, FMAN > firmware load address, QE firmware load address, U-Boot start address > on serial flash and environment address. > > Signed-off-by: Alison Wang> --- > arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 > include/configs/ls1043a_common.h | 10 +- > include/configs/ls1043aqds.h | 10 +- > include/configs/ls1043ardb.h | 8 > 4 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > index 4c16c4c..82c76e2 100644 > --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig > @@ -163,11 +163,11 @@ endchoice > config SYS_LS_PPA_FW_ADDR > hex "Address of PPA firmware loading from" > depends on FSL_LS_PPA > - default 0x4050 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT > + default 0x4040 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT > default 0x580a0 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A > - default 0x6050 if SYS_LS_PPA_FW_IN_XIP > - default 0x50 if SYS_LS_PPA_FW_IN_MMC > - default 0x50 if SYS_LS_PPA_FW_IN_NAND > + default 0x6040 if SYS_LS_PPA_FW_IN_XIP > + default 0x40 if SYS_LS_PPA_FW_IN_MMC > + default 0x40 if SYS_LS_PPA_FW_IN_NAND > > help > If the PPA firmware locate at XIP flash, such as NOR or diff --git > a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h > index e269248..155da92 100644 > --- a/include/configs/ls1043a_common.h > +++ b/include/configs/ls1043a_common.h > @@ -208,9 +208,9 @@ > #define CONFIG_SYS_FM_MURAM_SIZE 0x6 > > #ifdef CONFIG_NAND_BOOT > -/* Store Fman ucode at offeset 0x16(11 blocks). */ > +/* Store Fman ucode at offeset 0x90(72 blocks). */ > #define CONFIG_SYS_QE_FMAN_FW_IN_NAND > -#define CONFIG_SYS_FMAN_FW_ADDR (11 * > CONFIG_SYS_NAND_BLOCK_SIZE) > +#define CONFIG_SYS_FMAN_FW_ADDR (72 * > CONFIG_SYS_NAND_BLOCK_SIZE) > #elif defined(CONFIG_SD_BOOT) > /* > * PBL SD boot image should stored at 0x1000(8 blocks), the size of > the image is @@ -218,10 +218,10 @@ > * 0x2000 (16 blocks), 8 + 2040 + 16 = 2064, enlarge it to 2080(0x820). > */ > #define CONFIG_SYS_QE_FMAN_FW_IN_MMC > -#define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x820) > +#define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x4800) Alison, Please update the comments. It still says 0x820. [Alison Wang] Yes, I will update. Thanks for reminding me. Best Regards, Alison Wang ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v2 1/3] arm: ls1021a: Adjust memory mapping for Flash/SD card on LS1021AQDS/TWR
This patch is to adjust the memory mapping for FLash/SD card on LS1021AQDS and LS1021ATWR, such as U-Boot start address on serial Flash, QE firmware load address and environment address. Signed-off-by: Alison Wang--- Changes: - None include/configs/ls1021aqds.h | 10 +- include/configs/ls1021atwr.h | 10 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index c3224c8..97f6c43 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -69,7 +69,7 @@ unsigned long get_board_ddr_clk(void); #endif #ifdef CONFIG_QSPI_BOOT -#define CONFIG_SYS_TEXT_BASE 0x4001 +#define CONFIG_SYS_TEXT_BASE 0x4010 #endif #ifdef CONFIG_NAND_BOOT @@ -499,7 +499,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_DEVICE_DISABLE -#define CONFIG_SYS_QE_FW_ADDR 0x600c +#define CONFIG_SYS_QE_FW_ADDR 0x6094 #ifdef CONFIG_LPUART #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -550,14 +550,14 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SD_BOOT) -#define CONFIG_ENV_OFFSET 0x10 +#define CONFIG_ENV_OFFSET 0x30 #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE0x2000 #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE0x2000 /* 8KB */ -#define CONFIG_ENV_OFFSET 0x10/* 1MB */ +#define CONFIG_ENV_OFFSET 0x30/* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x1 #elif defined(CONFIG_NAND_BOOT) #define CONFIG_ENV_IS_IN_NAND @@ -565,7 +565,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #else #define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_ADDR(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + 0x30) #define CONFIG_ENV_SIZE0x2000 #define CONFIG_ENV_SECT_SIZE 0x2 /* 128K (one sector) */ #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 1d0b469..aecbee0 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -133,7 +133,7 @@ #endif #ifdef CONFIG_QSPI_BOOT -#define CONFIG_SYS_TEXT_BASE 0x4001 +#define CONFIG_SYS_TEXT_BASE 0x4010 #endif #ifndef CONFIG_SYS_TEXT_BASE @@ -410,7 +410,7 @@ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ #endif -#define CONFIG_SYS_QE_FW_ADDR 0x600c +#define CONFIG_SYS_QE_FW_ADDR 0x6094 /* * Environment @@ -418,18 +418,18 @@ #define CONFIG_ENV_OVERWRITE #if defined(CONFIG_SD_BOOT) -#define CONFIG_ENV_OFFSET 0x10 +#define CONFIG_ENV_OFFSET 0x30 #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE0x2 #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE0x2000 -#define CONFIG_ENV_OFFSET 0x10 +#define CONFIG_ENV_OFFSET 0x30 #define CONFIG_ENV_SECT_SIZE 0x1 #else #define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_ADDR(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + 0x30) #define CONFIG_ENV_SIZE0x2 #define CONFIG_ENV_SECT_SIZE 0x2 /* 128K (one sector) */ #endif -- 2.1.0.27.g96db324 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v3 3/3] armv8: layerscape: Adjust memory mapping for Flash/SD card on LS1046A
This patch is to adjust the memory mapping for FLash/SD card on LS1046AQDS and LS1046ARDB, such as FMAN firmware load address, U-Boot start address on serial flash and environment address. Signed-off-by: Alison Wang--- Changes: - Update the comments and README. board/freescale/ls1046ardb/README | 16 include/configs/ls1046a_common.h | 10 +- include/configs/ls1046aqds.h | 10 +- include/configs/ls1046ardb.h | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/board/freescale/ls1046ardb/README b/board/freescale/ls1046ardb/README index 1ef7d47..a38c9d4 100644 --- a/board/freescale/ls1046ardb/README +++ b/board/freescale/ls1046ardb/README @@ -59,14 +59,14 @@ Start AddressEnd Address Description Size QSPI flash map: Start AddressEnd Address Description Size 0x00_4000_ - 0x00_400F_ RCW + PBI 1MB -0x00_4010_ - 0x00_401F_ U-Boot1MB -0x00_4020_ - 0x00_402F_ U-Boot Env1MB -0x00_4030_ - 0x00_403F_ FMan ucode1MB -0x00_4040_ - 0x00_404F_ UEFI 1MB -0x00_4050_ - 0x00_406F_ PPA 2MB -0x00_4070_ - 0x00_408F_ Secure boot header -+ bootscript 2MB -0x00_4090_ - 0x00_40FF_ Reserved 7MB +0x00_4010_ - 0x00_402F_ U-Boot2MB +0x00_4030_ - 0x00_403F_ U-Boot Env1MB +0x00_4040_ - 0x00_405F_ PPA 2MB +0x00_4060_ - 0x00_408F_ Secure boot header ++ bootscript 3MB +0x00_4090_ - 0x00_4093_ FMan ucode256KB +0x00_4094_ - 0x00_4097_ QE/uQE firmware 256KB +0x00_4098_ - 0x00_40FF_ Reserved 6MB 0x00_4100_ - 0x00_43FF_ FIT Image 48MB Booting Options diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 957ffd3..61bf3eb 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -166,23 +166,23 @@ /* * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is * about 1MB (2048 blocks), Env is stored after the image, and the env size is - * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 2080(0x820). + * 0x2000 (16 blocks), 8 + 2048 + 16 = 2072, enlarge it to 18432(0x4800). */ #define CONFIG_SYS_QE_FMAN_FW_IN_MMC -#define CONFIG_SYS_FMAN_FW_ADDR(512 * 0x820) +#define CONFIG_SYS_FMAN_FW_ADDR(512 * 0x4800) #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH -#define CONFIG_SYS_FMAN_FW_ADDR0x4030 +#define CONFIG_SYS_FMAN_FW_ADDR0x4090 #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 100 #define CONFIG_ENV_SPI_MODE0x03 #elif defined(CONFIG_NAND_BOOT) #define CONFIG_SYS_QE_FMAN_FW_IN_NAND -#define CONFIG_SYS_FMAN_FW_ADDR(6 * CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_SYS_FMAN_FW_ADDR(72 * CONFIG_SYS_NAND_BLOCK_SIZE) #else #define CONFIG_SYS_QE_FMAN_FW_IN_NOR -#define CONFIG_SYS_FMAN_FW_ADDR0x6030 +#define CONFIG_SYS_FMAN_FW_ADDR0x6090 #endif #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x1 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 0cf6010..5d2e819 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -12,7 +12,7 @@ #if defined(CONFIG_NAND_BOOT) || defined(CONFIG_SD_BOOT) #define CONFIG_SYS_TEXT_BASE 0x8200 #elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x4001 +#define CONFIG_SYS_TEXT_BASE 0x4010 #else #define CONFIG_SYS_TEXT_BASE 0x6010 #endif @@ -447,20 +447,20 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_NAND_BOOT #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE0x2000 -#define CONFIG_ENV_OFFSET (5 * CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SD_BOOT) -#define CONFIG_ENV_OFFSET (1024 * 1024) +#define CONFIG_ENV_OFFSET (3 * 1024 * 1024) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE0x2000 #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE0x2000 /* 8KB */ -#define CONFIG_ENV_OFFSET 0x10/* 1MB */ +#define CONFIG_ENV_OFFSET 0x30/* 3MB */ #define CONFIG_ENV_SECT_SIZE
[U-Boot] [PATCH v2 2/3] armv8: layerscape: Adjust memory mapping for Flash/SD card on LS1043A
This patch is to adjust the memory mapping for FLash/SD card on LS1043AQDS and LS1043ARDB, such as PPA firmware load address, FMAN firmware load address, QE firmware load address, U-Boot start address on serial flash and environment address. Signed-off-by: Alison Wang--- Changes: - Update the comments. arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 8 include/configs/ls1043a_common.h | 12 ++-- include/configs/ls1043aqds.h | 10 +- include/configs/ls1043ardb.h | 8 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 4c16c4c..82c76e2 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -163,11 +163,11 @@ endchoice config SYS_LS_PPA_FW_ADDR hex "Address of PPA firmware loading from" depends on FSL_LS_PPA - default 0x4050 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT + default 0x4040 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT default 0x580a0 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A - default 0x6050 if SYS_LS_PPA_FW_IN_XIP - default 0x50 if SYS_LS_PPA_FW_IN_MMC - default 0x50 if SYS_LS_PPA_FW_IN_NAND + default 0x6040 if SYS_LS_PPA_FW_IN_XIP + default 0x40 if SYS_LS_PPA_FW_IN_MMC + default 0x40 if SYS_LS_PPA_FW_IN_NAND help If the PPA firmware locate at XIP flash, such as NOR or diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e269248..05419fe 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -208,20 +208,20 @@ #define CONFIG_SYS_FM_MURAM_SIZE 0x6 #ifdef CONFIG_NAND_BOOT -/* Store Fman ucode at offeset 0x16(11 blocks). */ +/* Store Fman ucode at offeset 0x90(72 blocks). */ #define CONFIG_SYS_QE_FMAN_FW_IN_NAND -#define CONFIG_SYS_FMAN_FW_ADDR(11 * CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_SYS_FMAN_FW_ADDR(72 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SD_BOOT) /* * PBL SD boot image should stored at 0x1000(8 blocks), the size of the image is * about 1MB (2040 blocks), Env is stored after the image, and the env size is - * 0x2000 (16 blocks), 8 + 2040 + 16 = 2064, enlarge it to 2080(0x820). + * 0x2000 (16 blocks), 8 + 2040 + 16 = 2064, enlarge it to 18432(0x4800). */ #define CONFIG_SYS_QE_FMAN_FW_IN_MMC -#define CONFIG_SYS_FMAN_FW_ADDR(512 * 0x820) +#define CONFIG_SYS_FMAN_FW_ADDR(512 * 0x4800) #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_SYS_QE_FW_IN_SPIFLASH -#define CONFIG_SYS_FMAN_FW_ADDR0x400d +#define CONFIG_SYS_FMAN_FW_ADDR0x4090 #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 100 @@ -229,7 +229,7 @@ #else #define CONFIG_SYS_QE_FMAN_FW_IN_NOR /* FMan fireware Pre-load address */ -#define CONFIG_SYS_FMAN_FW_ADDR0x6030 +#define CONFIG_SYS_FMAN_FW_ADDR0x6090 #endif #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x1 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index b14e944..04d74ac 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -12,7 +12,7 @@ #if defined(CONFIG_NAND_BOOT) || defined(CONFIG_SD_BOOT) #define CONFIG_SYS_TEXT_BASE 0x8200 #elif defined(CONFIG_QSPI_BOOT) -#define CONFIG_SYS_TEXT_BASE 0x4001 +#define CONFIG_SYS_TEXT_BASE 0x4010 #else #define CONFIG_SYS_TEXT_BASE 0x6010 #endif @@ -413,20 +413,20 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_NAND_BOOT #define CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE0x2000 -#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_ENV_OFFSET (24 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SD_BOOT) -#define CONFIG_ENV_OFFSET (1024 * 1024) +#define CONFIG_ENV_OFFSET (3 * 1024 * 1024) #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE0x2000 #elif defined(CONFIG_QSPI_BOOT) #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE0x2000 /* 8KB */ -#define CONFIG_ENV_OFFSET 0x10/* 1MB */ +#define CONFIG_ENV_OFFSET 0x30/* 3MB */ #define CONFIG_ENV_SECT_SIZE 0x1 #else #define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + 0x20) +#define CONFIG_ENV_ADDR(CONFIG_SYS_FLASH_BASE + 0x30) #define
Re: [U-Boot] [PATCH v4 00/20] SPL: extend FIT loading support
I though I have add review and test tags for the first 5 patches, anyway, I will add again. Not sure if some patches for sunxi still need to wait, can we merge patches for SPL/FIT first? Thanks, - Kever On 04/26/2017 08:32 AM, Andre Przywara wrote: Another round of smaller fixes for the SPL FIT loading series and the respective patches to enable this feature on 64-bit Allwinner SoCs. The README has been changed to address all 64-bit Allwinner boards and has consequently been renamed to README.sunxi64. Also we can now point U-Boot to the ARM Trusted Firmware build by specifying the filename in the BL31 environment variable. If this is not set, we default to look for bl31.bin in U-Boot's build directory. The other minor fixes are detailed in the Changelog below. --- The first five patches introduce the core of the extened SPL FIT loading support, see below for a description. Patch 6 fixes a Kconfig dependency to simplify the usage of this option. Patches 7-10 make some room in the sunxi 64-bit SPL to allow compiling in the FIT loading bits. Patch 11 and 12 let the SPL choose the proper DT from the FIT image. The next two patches add the infrastructure and an actual generator script, so the FIT image is automatically created at build time. Patches 14, 15 and 16 enable the SPL FIT support for Allwinner 64-bit SoCs in general and for the Pine64 and OrangePi PC 2 in particular. The following two patches store a DT file name in the SPL header, so U-Boot can easily pick the proper DT when scanning the FIT image. The idea is that this DT name should stay with the board, ideally on eMMC or SPI flash. So both U-Boot and a firmware update tool could identify a board, updating with compatible firmware while keeping the DT name in place. Ideally a board vendor would once seed this name onto on-board storage like SPI flash. I kept those two patches in, as the work on replacing mksunxiboot with an mkimage extension is not ready yet. Feel free to drop those from the series if this is a problem. The penultimate patch updates the Pine64 README file to document the current way of building U-Boot, which now includes the ARM Trusted Firmware build in its image. The last patch moves the maintainership from Hans over to me. I would be delighted if that series could get merged into the sunxi tree. This finally enables the fully open source firmware for the 64-bit Allwinner SoCs (including the ATF binary). This series is based on current sunxi/master. Cheers, Andre. --- Currently the FIT format is not used to its full potential in the SPL: It only loads the first image from the /images node and appends the proper FDT. Some boards and platforms would benefit from loading more images before starting U-Boot proper, notably Allwinner A64 and ARMv8 Rockchip boards, which use an ARM Trusted Firmware (ATF) image to be executed before U-Boot. This series tries to solve this in a board agnostic and generic way: We extend the SPL FIT loading scheme to allow loading multiple images. So apart from loading the image which is referenced by the "firmware" property in the respective configuration node and placing the DTB right behind it, we iterate over all strings in the "loadable" property. Each image referenced there will be loaded to its specified load address. The entry point U-Boot eventually branches to will be taken from the first image to explicitly provide the "entry" property, or, if none of them does so, from the load address of the "firmware" image. This keeps the scheme compatible with the FIT images our Makefile creates automatically at the moment. Apart from the already mentioned ATF scenario this opens up more usage scenarios, of which the commit message of patch 04/11 lists some. The remaining patches prepare ane finally enable this scheme for the 64-bit Allwinner boards. Changelog v3 ... v4: - [01/20]: return proper error codes instead of just -1 (+Simon's RB) - [02/20]: improve kernel-doc comment (+Simon's RB) - [03/20]: return proper error codes instead of just -1 (+Simon's RB) - [04/20]: improve kernel-doc comment and error codes (+Simon's RB) - [05/20]: add example .its source file (+Simon's RB) - [10,11,12/20]: add Maxime's Acked-by - [14/20]: add BL31 environment variable (+Maxime's Acked-by) - [15/20]: drop unneeded OrangePi PC2 change - [16/20]: add Maxime's Acked-by - [19/20]: rewrite to be more generic, rename to README.sunxi64 - [20/20]: new patch to change maintainership Changelog v2 ... v3: - new patch 06/19 to improve SPL_FIT Kconfig dependencies - rename symbol in mksunxiboot (SUNXI_SRAM instead of SUN4I_SRAM) - enable SPL_LOAD_FIT for all Allwinner A64 and H5 boards in Kconfig - add only CONFIG_OF_LIST to defconfigs (patch 15/19) Changelog v1 ... v2: - Add some function comments to spl_fit.c (patch 1-5) - Improve error handling in SPL FIT code (patch 1-5) - Fix bisectability (observing entry-point property) - add documentation to doc/uImage.FIT/howto.txt - fix Freescale CCN504 build failure
Re: [U-Boot] [PATCH v4 05/20] SPL: FIT: allow loading multiple images
On 04/26/2017 08:32 AM, Andre Przywara wrote: So far we were not using the FIT image format to its full potential: The SPL FIT loader was just loading the first image from the /images node plus one of the listed DTBs. Now with the refactored loader code it's easy to load an arbitrary number of images in addition to the two mentioned above. As described in the FIT image source file format description, iterate over all images listed at the "loadables" property in the configuration node and load every image at its desired location. This allows to load any kind of images: - firmware images to execute before U-Boot proper (for instance ARM Trusted Firmware (ATF)) - firmware images for management processors (SCP, arisc, ...) - firmware images for devices like WiFi controllers - bit files for FPGAs - additional configuration data - kernels and/or ramdisks The actual usage of this feature would be platform and/or board specific. Also update the FIT documentation to mention the new SPL feature and provide an example .its file to demonstrate its features. Signed-off-by: Andre PrzywaraReviewed-by: Lokesh Vutla Reviewed-by: Simon Glass Reviewed-by: Kever Yang Tested-by: Kever Yang Thanks, - Kever --- common/spl/spl_fit.c | 42 - doc/uImage.FIT/howto.txt | 21 +++ doc/uImage.FIT/multi_spl.its | 89 3 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 doc/uImage.FIT/multi_spl.its diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 9d9338c..4c42a96 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -234,6 +234,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, struct spl_image_info image_info; int node, images, ret; int base_offset, align_len = ARCH_DMA_MINALIGN - 1; + int index = 0; /* * Figure out where the external images start. This is the base for the @@ -278,6 +279,11 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, if (node < 0) { debug("could not find firmware image, trying loadables...\n"); node = spl_fit_get_image_node(fit, images, "loadables", 0); + /* +* If we pick the U-Boot image from "loadables", start at +* the second image when later loading additional images. +*/ + index = 1; } if (node < 0) { debug("%s: Cannot find u-boot image node: %d\n", @@ -305,6 +311,38 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, * Align the destination address to ARCH_DMA_MINALIGN. */ image_info.load_addr = spl_image->load_addr + spl_image->size; - return spl_load_fit_image(info, sector, fit, base_offset, node, - _info); + ret = spl_load_fit_image(info, sector, fit, base_offset, node, +_info); + if (ret < 0) + return ret; + + /* Now check if there are more images for us to load */ + for (; ; index++) { + node = spl_fit_get_image_node(fit, images, "loadables", index); + if (node < 0) + break; + + ret = spl_load_fit_image(info, sector, fit, base_offset, node, +_info); + if (ret < 0) + continue; + + /* +* If the "firmware" image did not provide an entry point, +* use the first valid entry point from the loadables. +*/ + if (spl_image->entry_point == FDT_ERROR && + image_info.entry_point != FDT_ERROR) + spl_image->entry_point = image_info.entry_point; + } + + /* +* If a platform does not provide CONFIG_SYS_UBOOT_START, U-Boot's +* Makefile will set it to 0 and it will end up as the entry point +* here. What it actually means is: use the load address. +*/ + if (spl_image->entry_point == FDT_ERROR || spl_image->entry_point == 0) + spl_image->entry_point = spl_image->load_addr; + + return 0; } diff --git a/doc/uImage.FIT/howto.txt b/doc/uImage.FIT/howto.txt index 14e316f..2988a52 100644 --- a/doc/uImage.FIT/howto.txt +++ b/doc/uImage.FIT/howto.txt @@ -44,6 +44,27 @@ image source file mkimage + dtctransfer to target +---> image file > bootm image data file(s) +SPL usage +- + +The SPL can make use of the new image format as well, this traditionally +is used to ship multiple device tree files within one image. Code in the SPL +will choose the one matching the current board and append this to the +U-Boot proper
Re: [U-Boot] [PATCH v4 04/20] SPL: FIT: factor out spl_load_fit_image()
On 04/26/2017 08:32 AM, Andre Przywara wrote: At the moment we load two images from a FIT image: the actual U-Boot image and the .dtb file. Both times we have very similar code, that deals with alignment requirements the media we load from imposes upon us. Factor out this code into a new function, which we just call twice. Signed-off-by: Andre PrzywaraReviewed-by: Simon Glass Reviewed-by: Kever Yang Tested-by: Kever Yang Thanks, - Kever --- common/spl/spl_fit.c | 162 +-- 1 file changed, 80 insertions(+), 82 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index ecd42d8..9d9338c 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -159,19 +159,81 @@ static int get_aligned_image_size(struct spl_load_info *info, int data_size, return (data_size + info->bl_len - 1) / info->bl_len; } +/** + * spl_load_fit_image(): load the image described in a certain FIT node + * @info: points to information about the device to load data from + * @sector:the start sector of the FIT image on the device + * @fit: points to the flattened device tree blob describing the FIT + * image + * @base_offset: the beginning of the data area containing the actual + * image data, relative to the beginning of the FIT + * @node: offset of the DT node describing the image to load (relative + * to @fit) + * @image_info:will be filled with information about the loaded image + * If the FIT node does not contain a "load" (address) property, + * the image gets loaded to the address pointed to by the + * load_addr member in this struct. + * + * Return: 0 on success or a negative error number. + */ +static int spl_load_fit_image(struct spl_load_info *info, ulong sector, + void *fit, ulong base_offset, int node, + struct spl_image_info *image_info) +{ + ulong offset; + size_t length; + ulong load_addr, load_ptr; + void *src; + ulong overhead; + int nr_sectors; + int align_len = ARCH_DMA_MINALIGN - 1; + + offset = fdt_getprop_u32(fit, node, "data-offset"); + if (offset == FDT_ERROR) + return -ENOENT; + offset += base_offset; + length = fdt_getprop_u32(fit, node, "data-size"); + if (length == FDT_ERROR) + return -ENOENT; + load_addr = fdt_getprop_u32(fit, node, "load"); + if (load_addr == FDT_ERROR && image_info) + load_addr = image_info->load_addr; + load_ptr = (load_addr + align_len) & ~align_len; + + overhead = get_aligned_image_overhead(info, offset); + nr_sectors = get_aligned_image_size(info, length, offset); + + if (info->read(info, sector + get_aligned_image_offset(info, offset), + nr_sectors, (void*)load_ptr) != nr_sectors) + return -EIO; + debug("image: dst=%lx, offset=%lx, size=%lx\n", load_ptr, offset, + (unsigned long)length); + + src = (void *)load_ptr + overhead; +#ifdef CONFIG_SPL_FIT_IMAGE_POST_PROCESS + board_fit_image_post_process(, ); +#endif + + memcpy((void*)load_addr, src, length); + + if (image_info) { + image_info->load_addr = load_addr; + image_info->size = length; + image_info->entry_point = fdt_getprop_u32(fit, node, "entry"); + } + + return 0; +} + int spl_load_simple_fit(struct spl_image_info *spl_image, struct spl_load_info *info, ulong sector, void *fit) { int sectors; - ulong size, load; + ulong size; unsigned long count; - int node, images; - void *load_ptr; - int fdt_offset, fdt_len; - int data_offset, data_size; + struct spl_image_info image_info; + int node, images, ret; int base_offset, align_len = ARCH_DMA_MINALIGN - 1; - int src_sector; - void *dst, *src; /* * Figure out where the external images start. This is the base for the @@ -223,46 +285,13 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, return -1; } - /* Get its information and set up the spl_image structure */ - data_offset = fdt_getprop_u32(fit, node, "data-offset"); - if (data_offset == FDT_ERROR) - return -ENOENT; - data_size = fdt_getprop_u32(fit, node, "data-size"); - if (data_size == FDT_ERROR) - return -ENOENT; - load = fdt_getprop_u32(fit, node, "load"); - debug("data_offset=%x, data_size=%x\n", data_offset, data_size); - spl_image->load_addr = load; - spl_image->entry_point = load; - spl_image->os = IH_OS_U_BOOT; - - /* -* Work out where to place
Re: [U-Boot] [PATCH v4 02/20] SPL: FIT: rework U-Boot image loading
On 04/26/2017 08:32 AM, Andre Przywara wrote: Currently the SPL FIT loader always looks only for the first image in the /images node a FIT tree, which it loads and later executes. Generalize this by looking for a "firmware" property in the matched configuration subnode, or, if that does not exist, for the first string in the "loadables" property. Then using the string in that property, load the image of that name from the /images node. This still loads only one image at the moment, but refactors the code to allow extending this in a following patch. To simplify later re-usage, we also generalize the spl_fit_select_index() function to not return the image location, but just the node offset. Signed-off-by: Andre PrzywaraReviewed-by: Lokesh Vutla Reviewed-by: Simon Glass Reviewed-by: Kever Yang Tested-by: Kever Yang Thanks, - Kever --- common/spl/spl_fit.c | 46 -- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 67372ca..85af980 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -60,14 +60,25 @@ static int spl_fit_find_config_node(const void *fdt) return -ENOENT; } -static int spl_fit_select_index(const void *fit, int images, int *offsetp, - const char *type, int index) +/** + * spl_fit_get_image_node(): By using the matching configuration subnode, + * retrieve the name of an image, specified by a property name and an index + * into that. + * @fit: Pointer to the FDT blob. + * @images:Offset of the /images subnode. + * @type: Name of the property within the configuration subnode. + * @index: Index into the list of strings in this property. + * + * Return: the node offset of the respective image node or a negative + * error number. + */ +static int spl_fit_get_image_node(const void *fit, int images, + const char *type, int index) { const char *name, *str; int node, conf_node; int len, i; - *offsetp = 0; conf_node = spl_fit_find_config_node(fit); if (conf_node < 0) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT @@ -104,10 +115,7 @@ static int spl_fit_select_index(const void *fit, int images, int *offsetp, return -EINVAL; } - *offsetp = fdt_getprop_u32(fit, node, "data-offset"); - len = fdt_getprop_u32(fit, node, "data-size"); - - return len; + return node; } static int get_aligned_image_offset(struct spl_load_info *info, int offset) @@ -193,15 +201,22 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, if (count == 0) return -EIO; - /* find the firmware image to load */ + /* find the node holding the images information */ images = fdt_path_offset(fit, FIT_IMAGES_PATH); if (images < 0) { debug("%s: Cannot find /images node: %d\n", __func__, images); return -1; } - node = fdt_first_subnode(fit, images); + + /* find the U-Boot image */ + node = spl_fit_get_image_node(fit, images, "firmware", 0); if (node < 0) { - debug("%s: Cannot find first image node: %d\n", __func__, node); + debug("could not find firmware image, trying loadables...\n"); + node = spl_fit_get_image_node(fit, images, "loadables", 0); + } + if (node < 0) { + debug("%s: Cannot find u-boot image node: %d\n", + __func__, node); return -1; } @@ -243,10 +258,13 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, memcpy(dst, src, data_size); /* Figure out which device tree the board wants to use */ - fdt_len = spl_fit_select_index(fit, images, _offset, - FIT_FDT_PROP, 0); - if (fdt_len < 0) - return fdt_len; + node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, 0); + if (node < 0) { + debug("%s: cannot find FDT node\n", __func__); + return node; + } + fdt_offset = fdt_getprop_u32(fit, node, "data-offset"); + fdt_len = fdt_getprop_u32(fit, node, "data-size"); /* * Read the device tree and place it after the image. There may be ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v4 03/20] SPL: FIT: improve error handling
On 04/26/2017 08:32 AM, Andre Przywara wrote: At the moment we ignore any errors due to missing FIT properties, instead go ahead and calculate our addresses with the -1 return value. Fix this and bail out if any of the mandatory properties are missing. Signed-off-by: Andre PrzywaraReviewed-by: Simon Glass Reviewed-by: Kever Yang Tested-by: Kever Yang Thanks, - Kever --- common/spl/spl_fit.c | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 85af980..ecd42d8 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -11,14 +11,17 @@ #include #include +#define FDT_ERROR ((ulong)(-1)) + static ulong fdt_getprop_u32(const void *fdt, int node, const char *prop) { const u32 *cell; int len; cell = fdt_getprop(fdt, node, prop, ); - if (len != sizeof(*cell)) - return -1U; + if (!cell || len != sizeof(*cell)) + return FDT_ERROR; + return fdt32_to_cpu(*cell); } @@ -222,7 +225,11 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, /* Get its information and set up the spl_image structure */ data_offset = fdt_getprop_u32(fit, node, "data-offset"); + if (data_offset == FDT_ERROR) + return -ENOENT; data_size = fdt_getprop_u32(fit, node, "data-size"); + if (data_size == FDT_ERROR) + return -ENOENT; load = fdt_getprop_u32(fit, node, "load"); debug("data_offset=%x, data_size=%x\n", data_offset, data_size); spl_image->load_addr = load; @@ -265,6 +272,10 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, } fdt_offset = fdt_getprop_u32(fit, node, "data-offset"); fdt_len = fdt_getprop_u32(fit, node, "data-size"); + if (fdt_offset == FDT_ERROR || fdt_len == FDT_ERROR) { + debug("%s: cannot load FDT data\n" __func__); + return -ENOENT; + } /* * Read the device tree and place it after the image. There may be ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v4 01/20] SPL: FIT: refactor FDT loading
On 04/26/2017 08:32 AM, Andre Przywara wrote: Currently the SPL FIT loader uses the spl_fit_select_fdt() function to find the offset to the right DTB within the FIT image. For this it iterates over all subnodes of the /configuration node in the FIT tree and compares all "description" strings therein using a board specific matching function. If that finds a match, it uses the string in the "fdt" property of that subnode to locate the matching subnode in the /images node, which points to the DTB data. Now this works very well, but is quite specific to cover this particular use case. To open up the door for a more generic usage, let's split this function into: 1) a function that just returns the node offset for the matching configuration node (spl_fit_find_config_node()) 2) a function that returns the image data any given property in a given configuration node points to, additionally using a given index into a possbile list of strings (spl_fit_select_index()) This allows us to replace the specific function above by asking for the image the _first string of the "fdt" property_ in the matching configuration subnode points to. This patch introduces no functional changes, it just refactors the code to allow reusing it later. (diff is overly clever here and produces a hard-to-read patch, so I recommend to throw a look at the result instead). Signed-off-by: Andre PrzywaraReviewed-by: Lokesh Vutla Reviewed-by: Simon Glass Reviewed-by: Kever Yang Tested-by: Kever Yang Thanks, - Kever --- common/spl/spl_fit.c | 88 ++-- 1 file changed, 57 insertions(+), 31 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index aae556f..67372ca 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -22,13 +22,16 @@ static ulong fdt_getprop_u32(const void *fdt, int node, const char *prop) return fdt32_to_cpu(*cell); } -static int spl_fit_select_fdt(const void *fdt, int images, int *fdt_offsetp) +/* + * Iterate over all /configurations subnodes and call a platform specific + * function to find the matching configuration. + * Returns the node offset or a negative error number. + */ +static int spl_fit_find_config_node(const void *fdt) { - const char *name, *fdt_name; - int conf, node, fdt_node; - int len; + const char *name; + int conf, node, len; - *fdt_offsetp = 0; conf = fdt_path_offset(fdt, FIT_CONFS_PATH); if (conf < 0) { debug("%s: Cannot find /configurations node: %d\n", __func__, @@ -50,39 +53,61 @@ static int spl_fit_select_fdt(const void *fdt, int images, int *fdt_offsetp) continue; debug("Selecting config '%s'", name); - fdt_name = fdt_getprop(fdt, node, FIT_FDT_PROP, ); - if (!fdt_name) { - debug("%s: Cannot find fdt name property: %d\n", - __func__, len); - return -EINVAL; - } - debug(", fdt '%s'\n", fdt_name); - fdt_node = fdt_subnode_offset(fdt, images, fdt_name); - if (fdt_node < 0) { - debug("%s: Cannot find fdt node '%s': %d\n", - __func__, fdt_name, fdt_node); - return -EINVAL; + return node; + } + + return -ENOENT; +} + +static int spl_fit_select_index(const void *fit, int images, int *offsetp, + const char *type, int index) +{ + const char *name, *str; + int node, conf_node; + int len, i; + + *offsetp = 0; + conf_node = spl_fit_find_config_node(fit); + if (conf_node < 0) { +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT + printf("No matching DT out of these options:\n"); + for (node = fdt_first_subnode(fit, conf_node); +node >= 0; +node = fdt_next_subnode(fit, node)) { + name = fdt_getprop(fit, node, "description", ); + printf(" %s\n", name); } +#endif + return conf_node; + } - *fdt_offsetp = fdt_getprop_u32(fdt, fdt_node, "data-offset"); - len = fdt_getprop_u32(fdt, fdt_node, "data-size"); - debug("FIT: Selected '%s'\n", name); + name = fdt_getprop(fit, conf_node, type, ); + if (!name) { + debug("cannot find property '%s': %d\n", type, len); + return -EINVAL; + } - return len; + str = name; + for (i = 0; i < index; i++) { + str = strchr(str, '\0') + 1; + if (!str || (str - name >= len)) { + debug("no string for index %d\n", index); + return -E2BIG; + }
Re: [U-Boot] [PATCH] rockchip: doc: update latest info to document
On 05/16/2017 02:51 AM, Heiko Stübner wrote: Hi Kever, Am Montag, 15. Mai 2017, 21:18:00 CEST schrieb Kever Yang: - Add some rk3399 and rk3328 boards; - use rkdeveloptool instead of rkflashtool; - use opensource.rock-chips.com instead of wikidot; - other update. Signed-off-by: Kever Yang--- doc/README.rockchip | 38 -- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/doc/README.rockchip b/doc/README.rockchip index 2d8cf9f..229db0d 100644 --- a/doc/README.rockchip +++ b/doc/README.rockchip @@ -14,9 +14,6 @@ many Rockchip devices [1] [2]. The current mainline support is experimental only and is not useful for anything. It should provide a base on which to build. -So far only support for the RK3288 and RK3036 is provided. - - Prerequisites = @@ -26,17 +23,18 @@ You will need: - Power connection to 5V using the supplied micro-USB power cable - Separate USB serial cable attached to your computer and the Firefly (connect to the micro-USB connector below the logo) - - rkflashtool [3] - - openssl (sudo apt-get install openssl) + - rkdeveloptool [3] In my personal opinion, rkflashtool should stay. You can very well add rkdeveloptool as a second option, but rkflashtool was there first and also is the one that most distributions contain in their repositories. And both tools seem to have the same functionality. OK, it can leave there, but I don't know why it does not works well with rk3399. Thanks, - Kever Heiko ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 01/33] mmc: select the available type from host_caps and card_caps
hi Simon & Jaehoon, On 05/16/2017 08:18 AM, Simon Glass wrote: Hi Ziyuan, On 15 May 2017 at 00:06, Ziyuan Xuwrote: The original implementation select HS timing by default, add available type selection for higher speed mode compatibility, such as hs200, hs400, hs400es. By the way, we assume that card run at 1.8V or 1.2V I/O when its timing is ddr52/hs200/hs400(es). Signed-off-by: Ziyuan Xu --- drivers/mmc/mmc.c | 59 ++- include/mmc.h | 16 +++ 2 files changed, 74 insertions(+), 1 deletion(-) Is there a cover letter for this series, please? This patchset is used for hs200/hs400/ddr52 mode of eMMC device, and fixes some bug for dw_mmc & sdhci controller. It's only valid in U-Boot stage, we still use 'High Speed' in SPL. I tested it on evb-rk3288 board(eMMC 4.5) and evb-rk3388 board(eMMC 5.0). I just reviewed an MMC series at add higher speed support. I'm not sure but I suspect these overlap. Ha, I just reviewed Vignesh's patches, it focuses on uhs mode of sd card. It looks to me. But some details are not the same as mine. Anyway, what do you think? Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3] QE: add QE support on SD boot
On 05/16/2017 1:26 AM, York Sunwrote: > -Original Message- > From: york sun > Sent: Tuesday, May 16, 2017 1:26 AM > To: Qiang Zhao ; Alison Wang > Cc: Mingkai Hu ; Xiaobo Xie ; u- > b...@lists.denx.de > Subject: Re: [PATCH v3] QE: add QE support on SD boot > > On 05/08/2017 11:32 PM, Zhao Qiang wrote: > > modify u_qe_init to upload QE firmware from SD card when it is SD boot > > > > Signed-off-by: Zhao Qiang > > --- > > Changes for v2: > > - fix issue of memory leak > > Changes for v3: > > - add CONFIG_SYS_QE_FMAN_FW_IN_NOR to ls1021a > > > > > /* > > diff --git a/include/configs/ls1043a_common.h > > b/include/configs/ls1043a_common.h > > index e269248..80c508e 100644 > > --- a/include/configs/ls1043a_common.h > > +++ b/include/configs/ls1043a_common.h > > @@ -219,6 +219,7 @@ > > */ > > #define CONFIG_SYS_QE_FMAN_FW_IN_MMC > > #define CONFIG_SYS_FMAN_FW_ADDR(512 * 0x820) > > +#define CONFIG_SYS_QE_FW_ADDR (512 * 0x4a08) > > #elif defined(CONFIG_QSPI_BOOT) > > #define CONFIG_SYS_QE_FW_IN_SPIFLASH > > #define CONFIG_SYS_FMAN_FW_ADDR0x400d > > @@ -230,6 +231,7 @@ > > #define CONFIG_SYS_QE_FMAN_FW_IN_NOR > > /* FMan fireware Pre-load address */ > > #define CONFIG_SYS_FMAN_FW_ADDR0x6030 > > +#define CONFIG_SYS_QE_FW_ADDR 0x6060 > > Qiang, > > Your patch and Alison's patch > (http://patchwork.ozlabs.org/patch/755865/) both modify the mapping. > Please confirm the addresses are still OK with both patches. Thank you for your reminders. I will rebase my patch on her patch. BR Qiang Zhao ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 14/47] Convert CONFIG_CMD_EEPROM et al to Kconfig
On Mon, May 15, 2017 at 06:18:13PM -0600, Simon Glass wrote: > Hi Tom, > > On 15 May 2017 at 12:04, Tom Riniwrote: > > On Mon, May 15, 2017 at 04:57:29AM -0600, Simon Glass wrote: > > > >> This converts the following to Kconfig: > >>CONFIG_CMD_EEPROM > >>CONFIG_CMD_EEPROM_LAYOUT > >>CONFIG_EEPROM_LAYOUT_HELP_STRING > >> > >> Signed-off-by: Simon Glass > > [snip] > >> 273 files changed, 259 insertions(+), 119 deletions(-) > > > > I feel there needs to be a bit more poking on places to imply > > CMD_EEPROM. Thanks! > > I did try pretty hard on this. Part of the problem is that some boards > that have a shared include file do not have a shared Kconfig option. I guess we can cycle back here later, this is OK for now, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 6/7] rockchip: rk3368: Add initial support for RK3368 based GeekBox
Hi: On 2017年05月15日 21:23, Andreas Färber wrote: Am 15.05.2017 um 11:54 schrieb Andy Yan: From: Andreas FärberThe GeekBox is a TV box from GeekBuying, based on an MXM3 module. The module can be used with base boards such as the GeekBox Landingship. This adds basic support to chain-load U-Boot from Rockchip's miniloader. Signed-off-by: Andreas Färber Signed-off-by: Andy Yan --- Changes in v2: None Still no README? I already added a README in this patch, but forgot to mention it in the changes log. I just confirmed that my original patchset had a separate commit for the .dts import, and then a big commit that added one line to it. You've squashed that into this single commit, and you fail to mention where the .dts comes from (e.g., v4.11?). It would be nice to have some "[...]" comment before your Signed-off-by that details which changes you made in my name here. Also, if my clock-frequency(?) line is still hidden in there, I believe that should be handled via some external -uboot.dtsi file by now? I keep all your dts file unmodified here. Regards, Andreas ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 32/47] Convert CONFIG_CMD_HDMIDETECT to Kconfig
On Mon, May 15, 2017 at 06:18:16PM -0600, Simon Glass wrote: > Hi Tom, > > On 15 May 2017 at 12:04, Tom Riniwrote: > > On Mon, May 15, 2017 at 04:57:47AM -0600, Simon Glass wrote: > > > >> This converts the following to Kconfig: > >>CONFIG_CMD_HDMIDETECT > >> > >> Signed-off-by: Simon Glass > > [snip] > >> +config CMD_HDMIDETECT > >> + bool "Support the 'hdmidet' command" > >> + help > >> + This enables the 'hdmidet' command which detects if an HDMI monitor > >> + is connected. > > > > default y if VIDEO ? > > It's only enabled for a small subset of mx6 boards, so I don't think I > can do that. It is not really a great implementation. It doesn't use > DM. OK, thanks. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 33/47] Convert CONFIG_CMD_IDE to Kconfig
On Mon, May 15, 2017 at 06:18:19PM -0600, Simon Glass wrote: > Hi Tom, > > On 15 May 2017 at 12:04, Tom Riniwrote: > > On Mon, May 15, 2017 at 04:57:48AM -0600, Simon Glass wrote: > > > >> This converts the following to Kconfig: > >>CONFIG_CMD_IDE > >> > >> Signed-off-by: Simon Glass > >> --- > >> > >> README | 1 - > >> cmd/Kconfig | 8 > > [snip] > > > > Nothing useful from the new moveconfig.py option to suggest imply lines? > > :( > > Nothing significant that I could find. One measure is that the number > of defconfig changes is not much more than the number of include > changes. True, but sometimes we can make things better, especially on PowerPC (85xx/86xx/etc) where there's much less use of a common header in the boards, outside of security stuff. But, OK, we can always come back later once everything is converted and see what sticks out. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v1 7/9] armv8: fsl-layerscape: Enable secure boot valiation for SPL boot
On Mon, May 15, 2017 at 09:16:07AM -0700, York Sun wrote: > Enable validation of PPA image for SPL boot. > > Signed-off-by: York Sun[snip] > +#include Looking at the contents of this file here, can you please do a follow-up to move pretty much most of this content to include/environment/fsl/chain_of_trust.h (or whatever name you thinks makes most sense) ? Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 01/33] mmc: select the available type from host_caps and card_caps
Hi Ziyuan, On 15 May 2017 at 00:06, Ziyuan Xuwrote: > The original implementation select HS timing by default, add available > type selection for higher speed mode compatibility, such as hs200, > hs400, hs400es. > > By the way, we assume that card run at 1.8V or 1.2V I/O when its timing > is ddr52/hs200/hs400(es). > > Signed-off-by: Ziyuan Xu > --- > > drivers/mmc/mmc.c | 59 > ++- > include/mmc.h | 16 +++ > 2 files changed, 74 insertions(+), 1 deletion(-) > Is there a cover letter for this series, please? I just reviewed an MMC series at add higher speed support. I'm not sure but I suspect these overlap. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 3/6] dm: ram: bmips: split bcm6358_get_ram_size
On 15 May 2017 at 11:13, Álvaro Fernández Rojaswrote: > This is done in order to reuse ram size calculation for BCM6338/BCM6348 > > Signed-off-by: Álvaro Fernández Rojas > --- > v2: no changes. > > drivers/ram/bmips_ram.c | 23 +-- > 1 file changed, 13 insertions(+), 10 deletions(-) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/6] dm: cpu: bmips: rename cpu_desc specific functions
On 12 May 2017 at 17:23, Álvaro Fernández Rojaswrote: > Use a generic name for cpu_desc functions instead of using a specific SoC one. > > Signed-off-by: Álvaro Fernández Rojas > --- > drivers/cpu/bmips_cpu.c | 10 +- > 1 file changed, 5 insertions(+), 5 deletions(-) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 4/6] dm: cpu: bmips: add BCM6338/BCM6348 support
On 12 May 2017 at 17:23, Álvaro Fernández Rojaswrote: > Signed-off-by: Álvaro Fernández Rojas > --- > drivers/ram/bmips_ram.c | 31 +++ > 1 file changed, 31 insertions(+) > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 2/2] doc: document u-boot, mmc-env-offset and u-boot, mmc-env-offset-redund
On 10 May 2017 at 06:44, Philipp Tomsichwrote: > Adding documentation on the new config properties: >'u-boot,mmc-env-offset' - overrides CONFIG_ENV_OFFSET >'u-boot,mmc-env-offset-redundant' >- overrides CONFIG_ENV_OFFSET_REDUND > > Signed-off-by: Philipp Tomsich > > --- > > Changes in v3: None > Changes in v2: > - added documentation in config.txt > > doc/device-tree-bindings/config.txt | 12 > 1 file changed, 12 insertions(+) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 7/8] mips: bmips: add wdt-reboot driver support for BCM6328
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > This driver allows rebooting the SoC by calling wdt_expire_now op. > > Signed-off-by: Álvaro Fernández Rojas > --- > arch/mips/dts/brcm,bcm6328.dtsi | 5 + > 1 file changed, 5 insertions(+) > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 33/47] Convert CONFIG_CMD_IDE to Kconfig
Hi Tom, On 15 May 2017 at 12:04, Tom Riniwrote: > On Mon, May 15, 2017 at 04:57:48AM -0600, Simon Glass wrote: > >> This converts the following to Kconfig: >>CONFIG_CMD_IDE >> >> Signed-off-by: Simon Glass >> --- >> >> README | 1 - >> cmd/Kconfig | 8 > [snip] > > Nothing useful from the new moveconfig.py option to suggest imply lines? > :( Nothing significant that I could find. One measure is that the number of defconfig changes is not much more than the number of include changes. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/8] mips: bmips: add bcm6345-wdt driver support for BCM6328
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > This driver controls the watchdog present on this SoC. > > Signed-off-by: Álvaro Fernández Rojas > --- > arch/mips/dts/brcm,bcm6328.dtsi | 6 ++ > 1 file changed, 6 insertions(+) > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 6/8] mips: bmips: add wdt-reboot driver support for BCM6358
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > This driver allows rebooting the SoC by calling wdt_expire_now op. > > Signed-off-by: Álvaro Fernández Rojas > --- > arch/mips/dts/brcm,bcm6358.dtsi | 5 + > 1 file changed, 5 insertions(+) > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 09/47] Drop digital thermometer and thermostat (DTT) drivers
Hi Tom, On 15 May 2017 at 10:59, Tom Riniwrote: > On Mon, May 15, 2017 at 04:57:24AM -0600, Simon Glass wrote: > >> This subsystem is quite old. It has been replaced with a driver-model >> version (UCLASS_THERMAL). Boards are free to convert to that if required, >> but here is a removal patch that could be applied in the meantime. >> >> Signed-off-by: Simon Glass >> --- >> >> README | 6 -- >> board/gdsys/405ep/dlvision-10g.c | 10 ++- >> board/gdsys/405ep/io.c | 10 ++- >> board/gdsys/405ep/neo.c| 10 ++- >> board/gdsys/405ex/io64.c | 10 ++- >> cmd/Makefile | 1 - >> cmd/dtt.c | 120 --- >> drivers/Kconfig| 2 - >> drivers/Makefile | 1 - >> drivers/hwmon/Kconfig | 0 >> drivers/hwmon/Makefile | 22 - >> drivers/hwmon/adm1021.c| 164 >> - >> drivers/hwmon/adt7460.c| 73 - >> drivers/hwmon/ds1621.c | 155 --- >> drivers/hwmon/ds1722.c | 137 --- >> drivers/hwmon/ds1775.c | 126 >> drivers/hwmon/ds620.c | 65 --- >> drivers/hwmon/lm63.c | 160 >> >> drivers/hwmon/lm73.c | 146 - >> drivers/hwmon/lm75.c | 139 --- >> drivers/hwmon/lm81.c | 111 - >> include/config_cmd_all.h | 1 - >> include/configs/PMC440.h | 21 - >> include/configs/TQM834x.h | 8 -- >> include/configs/UCP1020.h | 21 - >> include/configs/acadia.h | 9 -- >> include/configs/canyonlands.h | 11 --- >> include/configs/dlvision-10g.h | 8 -- >> include/configs/dlvision.h | 1 - >> include/configs/exynos5-common.h | 2 - >> include/configs/intip.h| 8 -- >> include/configs/io.h | 6 -- >> include/configs/io64.h | 9 -- >> include/configs/katmai.h | 25 -- >> include/configs/kilauea.h | 4 - >> include/configs/km/km-powerpc.h| 1 - >> include/configs/km/km83xx-common.h | 7 -- >> include/configs/km82xx.h | 7 -- >> include/configs/makalu.h | 5 -- >> include/configs/motionpro.h| 3 - >> include/configs/neo.h | 8 -- >> include/configs/odroid_xu3.h | 1 - >> include/configs/sequoia.h | 9 -- >> include/configs/socrates.h | 8 -- >> include/configs/tqma6.h| 10 --- >> include/configs/tqma6_mba6.h | 2 - >> include/configs/tqma6_wru4.h | 4 - >> include/configs/work_92105.h | 8 -- >> include/configs/xilinx-ppc.h | 1 - >> include/configs/xpedite517x.h | 3 - >> include/configs/xpedite537x.h | 3 - >> include/configs/xpedite550x.h | 3 - >> include/configs/yosemite.h | 9 -- >> include/dtt.h | 47 --- >> include/i2c.h | 3 - >> scripts/config_whitelist.txt | 22 - >> 56 files changed, 28 insertions(+), 1738 deletions(-) >> delete mode 100644 cmd/dtt.c >> delete mode 100644 drivers/hwmon/Kconfig >> delete mode 100644 drivers/hwmon/Makefile >> delete mode 100644 drivers/hwmon/adm1021.c >> delete mode 100644 drivers/hwmon/adt7460.c >> delete mode 100644 drivers/hwmon/ds1621.c >> delete mode 100644 drivers/hwmon/ds1722.c >> delete mode 100644 drivers/hwmon/ds1775.c >> delete mode 100644 drivers/hwmon/ds620.c >> delete mode 100644 drivers/hwmon/lm63.c >> delete mode 100644 drivers/hwmon/lm73.c >> delete mode 100644 drivers/hwmon/lm75.c >> delete mode 100644 drivers/hwmon/lm81.c >> delete mode 100644 include/dtt.h > > So, this touches a lot of boards that have active maintainer, lets ping > them now and see if anyone wants to step up and start converting some of > these drivers over. I'm not nak'ing this patch but raising awareness > that some stuff people depend on needs to be updated. Sounds good. Sorry for skipping the cc - I really need to make time to fix up patman unicode soon. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 2/8] mips: bmips: add bcm6345-wdt driver support for BCM6358
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > This driver controls the watchdog present on this SoC. > > Signed-off-by: Álvaro Fernández Rojas > --- > arch/mips/dts/brcm,bcm6358.dtsi | 6 ++ > 1 file changed, 6 insertions(+) > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 05/71] dm: Add a function to create a 'live' device tree
Hi Lothar, On 15 May 2017 at 01:34, Lothar Waßmannwrote: > Hi, > > On Sun, 14 May 2017 21:03:23 -0600 Simon Glass wrote: >> Hi Lothar, >> >> On 11 May 2017 at 08:59, Lothar Waßmann wrote: >> > Hi, >> > >> > On Wed, 10 May 2017 08:20:44 -0600 Simon Glass wrote: >> >> This function converts the flat device tree into a hierarchical one with >> >> C structures and pointers. This is easier to access. >> >> >> >> Signed-off-by: Simon Glass >> >> --- >> >> >> >> Changes in v2: None >> >> >> >> include/of_live.h | 24 >> >> lib/Makefile | 1 + >> >> lib/of_live.c | 333 >> >> ++ >> >> 3 files changed, 358 insertions(+) >> >> create mode 100644 include/of_live.h >> >> create mode 100644 lib/of_live.c >> >> >> >> diff --git a/include/of_live.h b/include/of_live.h >> >> new file mode 100644 >> >> index 00..f5303bb018 >> >> --- /dev/null >> >> +++ b/include/of_live.h >> >> @@ -0,0 +1,24 @@ >> >> +/* >> >> + * Copyright (c) 2017 Google, Inc >> >> + * Written by Simon Glass >> >> + * >> >> + * SPDX-License-Identifier: GPL-2.0+ >> >> + * >> >> + * Support for a 'live' (as opposed to flat) device tree >> >> + */ >> >> + >> >> +#ifndef _OF_LIVE_H >> >> +#define _OF_LIVE_H >> >> + >> >> +struct device_node; >> >> + >> >> +/** >> >> + * of_live_build() - build a live (hierarchical) tree from a flat DT >> >> + * >> >> + * @fdt_blob: Input tree to convert >> >> + * @rootp: Returns live tree that was created >> >> + * @return 0 if OK, -ve on error >> >> + */ >> >> +int of_live_build(const void *fdt_blob, struct device_node **rootp); >> >> + >> >> +#endif >> >> diff --git a/lib/Makefile b/lib/Makefile >> >> index 23e9f1ef11..bc2fb0a361 100644 >> >> --- a/lib/Makefile >> >> +++ b/lib/Makefile >> >> @@ -15,6 +15,7 @@ obj-$(CONFIG_ZLIB) += zlib/ >> >> obj-$(CONFIG_BZIP2) += bzip2/ >> >> obj-$(CONFIG_TIZEN) += tizen/ >> >> obj-$(CONFIG_FIT) += libfdt/ >> >> +obj-$(CONFIG_OF_LIVE) += of_live.o >> >> obj-$(CONFIG_CMD_DHRYSTONE) += dhry/ >> >> >> >> obj-$(CONFIG_AES) += aes.o >> >> diff --git a/lib/of_live.c b/lib/of_live.c >> >> new file mode 100644 >> >> index 00..51927f9e91 >> >> --- /dev/null >> >> +++ b/lib/of_live.c >> >> @@ -0,0 +1,333 @@ >> >> +/* >> >> + * Copyright 2009 Benjamin Herrenschmidt, IBM Corp >> >> + * b...@kernel.crashing.org >> >> + * >> >> + * Based on parts of drivers/of/fdt.c from Linux v4.9 >> >> + * Modifications for U-Boot >> >> + * Copyright (c) 2017 Google, Inc >> >> + * >> >> + * SPDX-License-Identifier: GPL-2.0+ >> >> + */ >> >> + >> >> +#include >> >> +#include >> >> +#include >> >> +#include >> >> +#include >> >> +#include >> >> + >> >> +DECLARE_GLOBAL_DATA_PTR; >> >> + >> >> +static void *unflatten_dt_alloc(void **mem, unsigned long size, >> >> + unsigned long align) >> >> +{ >> >> + void *res; >> >> + >> >> + *mem = PTR_ALIGN(*mem, align); >> >> + res = *mem; >> >> + *mem += size; >> >> + >> >> + return res; >> >> +} >> >> + >> >> +/** >> >> + * unflatten_dt_node() - Alloc and populate a device_node from the flat >> >> tree >> >> + * @blob: The parent device tree blob >> >> + * @mem: Memory chunk to use for allocating device nodes and properties >> >> + * @poffset: pointer to node in flat tree >> >> + * @dad: Parent struct device_node >> >> + * @nodepp: The device_node tree created by the call >> >> + * @fpsize: Size of the node path up at t05he current depth. >> >> + * @dryrun: If true, do not allocate device nodes but still calculate >> >> needed >> >> + * memory size >> >> + */ >> >> +static void *unflatten_dt_node(const void *blob, void *mem, int *poffset, >> >> +struct device_node *dad, >> >> +struct device_node **nodepp, >> >> +unsigned long fpsize, bool dryrun) >> >> +{ >> >> + const __be32 *p; >> >> + struct device_node *np; >> >> + struct property *pp, **prev_pp = NULL; >> >> + const char *pathp; >> >> + int l; >> >> + unsigned int allocl; >> >> + static int depth; >> >> + int old_depth; >> >> + int offset; >> >> + int has_name = 0; >> >> + int new_format = 0; >> >> + >> >> + pathp = fdt_get_name(blob, *poffset, ); >> >> + if (!pathp) >> >> + return mem; >> >> + >> >> + allocl = ++l; >> >> + >> >> + /* >> >> + * version 0x10 has a more compact unit name here instead of the >> >> full >> >> + * path. we accumulate the full path size using "fpsize", we'll >> >> rebuild >> >> + * it later. We detect this because the first character of the name >> >> is >> >> + * not '/'. >> >> + */ >> >> + if ((*pathp) != '/') { >> >> + new_format = 1; >> >> + if (fpsize == 0) { >> >> + /* >> >> + * root node: special
Re: [U-Boot] [PATCH v2 2/6] dm: cpu: bmips: add BCM6348 support
On 15 May 2017 at 11:13, Álvaro Fernández Rojaswrote: > Signed-off-by: Álvaro Fernández Rojas > --- > v2: no changes. > > drivers/cpu/bmips_cpu.c | 34 ++ > 1 file changed, 34 insertions(+) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 5/6] MIPS: add support for Broadcom MIPS BCM6348 SoC family
On 15 May 2017 at 11:13, Álvaro Fernández Rojaswrote: > Signed-off-by: Álvaro Fernández Rojas > --- > v2: remove comtrend ct-5361 Kconfig > > arch/mips/dts/brcm,bcm6348.dtsi | 127 > ++ > arch/mips/mach-bmips/Kconfig | 12 +++ > arch/mips/mach-bmips/include/ioremap.h| 3 +- > include/configs/bmips_bcm6348.h | 30 +++ > include/dt-bindings/clock/bcm6348-clock.h | 22 ++ > include/dt-bindings/reset/bcm6348-reset.h | 22 ++ > 6 files changed, 215 insertions(+), 1 deletion(-) > create mode 100644 arch/mips/dts/brcm,bcm6348.dtsi > create mode 100644 include/configs/bmips_bcm6348.h > create mode 100644 include/dt-bindings/clock/bcm6348-clock.h > create mode 100644 include/dt-bindings/reset/bcm6348-reset.h > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 4/8] mips: bmips: add bcm6345-wdt driver support for BCM63268
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > This driver controls the watchdog present on this SoC. > > Signed-off-by: Álvaro Fernández Rojas > --- > arch/mips/dts/brcm,bcm63268.dtsi | 6 ++ > 1 file changed, 6 insertions(+) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 14/47] Convert CONFIG_CMD_EEPROM et al to Kconfig
Hi Tom, On 15 May 2017 at 12:04, Tom Riniwrote: > On Mon, May 15, 2017 at 04:57:29AM -0600, Simon Glass wrote: > >> This converts the following to Kconfig: >>CONFIG_CMD_EEPROM >>CONFIG_CMD_EEPROM_LAYOUT >>CONFIG_EEPROM_LAYOUT_HELP_STRING >> >> Signed-off-by: Simon Glass > [snip] >> 273 files changed, 259 insertions(+), 119 deletions(-) > > I feel there needs to be a bit more poking on places to imply > CMD_EEPROM. Thanks! I did try pretty hard on this. Part of the problem is that some boards that have a shared include file do not have a shared Kconfig option. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2 6/6] MIPS: add BMIPS Comtrend CT-5361 board
On 15 May 2017 at 11:13, Álvaro Fernández Rojaswrote: > Signed-off-by: Álvaro Fernández Rojas > --- > v2: add comtrend ct-5361 Kconfig > > arch/mips/dts/Makefile| 1 + > arch/mips/dts/comtrend,ct-5361.dts| 49 ++ > arch/mips/mach-bmips/Kconfig | 6 > board/comtrend/ct5361/Kconfig | 12 > board/comtrend/ct5361/MAINTAINERS | 6 > board/comtrend/ct5361/Makefile| 5 +++ > board/comtrend/ct5361/ct-5361.c | 7 + > configs/comtrend_ct5361_ram_defconfig | 57 > +++ > include/configs/comtrend_ct5361.h | 20 > 9 files changed, 163 insertions(+) > create mode 100644 arch/mips/dts/comtrend,ct-5361.dts > create mode 100644 board/comtrend/ct5361/Kconfig > create mode 100644 board/comtrend/ct5361/MAINTAINERS > create mode 100644 board/comtrend/ct5361/Makefile > create mode 100644 board/comtrend/ct5361/ct-5361.c > create mode 100644 configs/comtrend_ct5361_ram_defconfig > create mode 100644 include/configs/comtrend_ct5361.h Reviewed-by: Simon Glass Please see below. > > diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile > index 4c02c48..9bab744 100644 > --- a/arch/mips/dts/Makefile > +++ b/arch/mips/dts/Makefile > @@ -9,6 +9,7 @@ dtb-$(CONFIG_TARGET_MALTA) += mti,malta.dtb > dtb-$(CONFIG_TARGET_PIC32MZDASK) += pic32mzda_sk.dtb > dtb-$(CONFIG_TARGET_XILFPGA) += nexys4ddr.dtb > dtb-$(CONFIG_BOARD_COMTREND_AR5387UN) += comtrend,ar-5387un.dtb > +dtb-$(CONFIG_BOARD_COMTREND_CT5361) += comtrend,ct-5361.dtb > dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb > dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb > dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += tplink_wdr4300.dtb > diff --git a/arch/mips/dts/comtrend,ct-5361.dts > b/arch/mips/dts/comtrend,ct-5361.dts > new file mode 100644 > index 000..c909a52 > --- /dev/null > +++ b/arch/mips/dts/comtrend,ct-5361.dts > @@ -0,0 +1,49 @@ > +/* > + * Copyright (C) 2017 Álvaro Fernández Rojas > + * > + * SPDX-License-Identifier:GPL-2.0+ > + */ > + > +/dts-v1/; > + > +#include "brcm,bcm6348.dtsi" > + > +/ { > + model = "Comtrend CT-5361"; > + compatible = "comtrend,ct-5361", "brcm,bcm6348"; > + > + aliases { > + serial0 = > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + gpio-leds { > + compatible = "gpio-leds"; > + > + power_green { > + label = "CT-5361:green:power"; > + gpios = < 0 1>; > + }; > + > + alarm_red { > + label = "CT-5361:red:alarm"; > + gpios = < 2 1>; > + }; > + }; > +}; > + > + { > + status = "okay"; > +}; > + > + { > + status = "okay"; > +}; > + > + { > + u-boot,dm-pre-reloc; > + status = "okay"; > +}; > diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig > index b7f7b1e..c2b0f89 100644 > --- a/arch/mips/mach-bmips/Kconfig > +++ b/arch/mips/mach-bmips/Kconfig > @@ -65,6 +65,11 @@ config BOARD_COMTREND_AR5387UN > depends on SOC_BMIPS_BCM6328 > select BMIPS_SUPPORTS_BOOT_RAM > > +config BOARD_COMTREND_CT5361 > + bool "Comtrend CT-5361" > + depends on SOC_BMIPS_BCM6348 > + select BMIPS_SUPPORTS_BOOT_RAM It would be good to add a paragraph describing each of these boards, peripherals, etc. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Fwd: arch/x86/cpu/x86_64/built-in.o: In function `checkcpu': (.text.checkcpu+0x0): multiple definition of `checkcpu' arch/x86/cpu/efi/built-in.o:(.text.checkcpu+0x0): first defined here
Hi, On 11 May 2017 at 01:39, Jeroen Rooverswrote: > On 11 May 2017 at 06:31, Bin Meng wrote: >> +Simon >> >> On Wed, May 10, 2017 at 6:15 PM, Jeroen Roovers wrote: >>> Trying to compile an x86_64 u-boot with EFI support: >>> >>> arch/x86/cpu/x86_64/built-in.o: In function `checkcpu': >>> (.text.checkcpu+0x0): multiple definition of `checkcpu' >>> arch/x86/cpu/efi/built-in.o:(.text.checkcpu+0x0): first defined here >>> arch/x86/cpu/x86_64/built-in.o: In function `arch_setup_gd': >>> /home/jer/airfi/airfi-base/buildroot-2016.02-apollo/output/build/uboot-2017.05/arch/x86/cpu/x86_64/cpu.c:18: >>> multiple definition of `misc_init_r' >>> arch/x86/cpu/efi/built-in.o:(.text.misc_init_r+0x0): first defined here >>> arch/x86/cpu/x86_64/built-in.o: In function `arch_setup_gd': >>> /home/jer/airfi/airfi-base/buildroot-2016.02-apollo/output/build/uboot-2017.05/arch/x86/cpu/x86_64/cpu.c:18: >>> multiple definition of `print_cpuinfo' >>> arch/x86/cpu/efi/built-in.o:(.text.print_cpuinfo+0x0): first defined here >>> make[2]: *** [scripts/Makefile.build:359: arch/x86/cpu/built-in.o] Error 1 >>> make[1]: *** [Makefile:1234: arch/x86/cpu] Error 2 >>> make[1]: *** Waiting for unfinished jobs >>> >>> with the attached configuration. Am I doing it wrong? >> >> I don't have the environment to test but did you use efi-x86_defconfig? > > No, the config I attached has been edited because when I use > efi-x86_defconfig I get a mix of 32-bit and 64-bit objects: > > /home/jer/airfi/airfi-base/apollo/output/host/usr/bin/x86_64-buildroot-linux-gnu-ld.bfd: > Relocatable linking with relocations from format elf32-i386 > (board/efi/efi-x86/efi.o) to format elf64-x86-64 > (board/efi/efi-x86/built-in.o) is not supported > make[2]: *** [scripts/Makefile.build:359: board/efi/efi-x86/built-in.o] Error > 1 > make[1]: *** [Makefile:1234: board/efi/efi-x86] Error 2 > make[1]: *** Waiting for unfinished jobs > > So I needed to adapt it for a 64-bit target by enabling CONFIG_X86_RUN_64BIT How did you provoke this build error? Did something change? Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 8/8] mips: bmips: add wdt-reboot driver support for BCM63268
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > This driver allows rebooting the SoC by calling wdt_expire_now op. > > Signed-off-by: Álvaro Fernández Rojas > --- > arch/mips/dts/brcm,bcm63268.dtsi | 5 + > 1 file changed, 5 insertions(+) > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 32/47] Convert CONFIG_CMD_HDMIDETECT to Kconfig
Hi Tom, On 15 May 2017 at 12:04, Tom Riniwrote: > On Mon, May 15, 2017 at 04:57:47AM -0600, Simon Glass wrote: > >> This converts the following to Kconfig: >>CONFIG_CMD_HDMIDETECT >> >> Signed-off-by: Simon Glass > [snip] >> +config CMD_HDMIDETECT >> + bool "Support the 'hdmidet' command" >> + help >> + This enables the 'hdmidet' command which detects if an HDMI monitor >> + is connected. > > default y if VIDEO ? It's only enabled for a small subset of mx6 boards, so I don't think I can do that. It is not really a great implementation. It doesn't use DM. - Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 5/8] dm: sysreset: add watchdog-reboot driver
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > Add a new sysreset driver that uses the recently added watchdog support. > It performs a full SoC reset by calling wdt_expire_now op. > > Signed-off-by: Álvaro Fernández Rojas > --- > drivers/sysreset/Kconfig | 6 > drivers/sysreset/Makefile| 1 + > drivers/sysreset/sysreset_watchdog.c | 57 > > 3 files changed, 64 insertions(+) > create mode 100644 drivers/sysreset/sysreset_watchdog.c > Reviewed-by: Simon Glass Please see below. > diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig > index b2f7464..a6d48e8 100644 > --- a/drivers/sysreset/Kconfig > +++ b/drivers/sysreset/Kconfig > @@ -31,4 +31,10 @@ config SYSRESET_SYSCON > help > Reboot support for generic SYSCON mapped register reset. > > +config SYSRESET_WATCHDOG > + bool "Enable support for watchdog reboot driver" > + select WDT > + help > + Reboot support for generic watchdog reset. > + > endmenu > diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile > index bd352e7..b683811 100644 > --- a/drivers/sysreset/Makefile > +++ b/drivers/sysreset/Makefile > @@ -7,6 +7,7 @@ > obj-$(CONFIG_SYSRESET) += sysreset-uclass.o > obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o > obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o > +obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o > > ifndef CONFIG_SPL_BUILD > obj-$(CONFIG_ROCKCHIP_RK3036) += sysreset_rk3036.o > diff --git a/drivers/sysreset/sysreset_watchdog.c > b/drivers/sysreset/sysreset_watchdog.c > new file mode 100644 > index 000..caeb039 > --- /dev/null > +++ b/drivers/sysreset/sysreset_watchdog.c > @@ -0,0 +1,57 @@ > +/* > + * Copyright (C) 2017 Álvaro Fernández Rojas > + * > + * SPDX-License-Identifier:GPL-2.0+ > + */ > + > +#include > +#include > +#include > +#include > +#include > + > +struct wdt_reboot_priv { > + struct udevice *wdt; > +}; > + > +static int wdt_reboot_request(struct udevice *dev, enum sysreset_t type) > +{ > + struct wdt_reboot_priv *priv = dev_get_priv(dev); > + > + wdt_expire_now(priv->wdt, 0); Missing error check? > + > + return -EINPROGRESS; > +} > + > +static struct sysreset_ops wdt_reboot_ops = { > + .request = wdt_reboot_request, > +}; > + > +int wdt_reboot_probe(struct udevice *dev) > +{ > + struct wdt_reboot_priv *priv = dev_get_priv(dev); > + int err; > + > + err = uclass_get_device_by_phandle(UCLASS_WDT, dev, > + "wdt", >wdt); > + if (err) { > + error("unable to find wdt device\n"); > + return err; > + } > + > + return 0; > +} > + > +static const struct udevice_id wdt_reboot_ids[] = { > + { .compatible = "wdt-reboot" }, > + { /* sentinel */ } > +}; > + > +U_BOOT_DRIVER(wdt_reboot) = { > + .name = "wdt_reboot", > + .id = UCLASS_SYSRESET, > + .of_match = wdt_reboot_ids, > + .ops = _reboot_ops, > + .priv_auto_alloc_size = sizeof(struct wdt_reboot_priv), > + .probe = wdt_reboot_probe, > +}; > -- > 2.1.4 > ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/8] dm: watchdog: add BCM6345 watchdog driver
On 12 May 2017 at 17:19, Álvaro Fernández Rojaswrote: > This driver is a simplified version of linux/drivers/watchdog/bcm63xx_wdt.c > > Signed-off-by: Álvaro Fernández Rojas > --- > drivers/watchdog/Kconfig | 8 +++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/bcm6345_wdt.c | 109 > + > 3 files changed, 118 insertions(+) > create mode 100644 drivers/watchdog/bcm6345_wdt.c > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] i.MX6: u-boot,dm-pre-reloc block U-Boot
Hi, On 13 May 2017 at 10:15, Jagan Tekiwrote: > Hi All, > > On Thu, May 11, 2017 at 1:40 PM, Jagan Teki wrote: >> On Thu, May 11, 2017 at 7:39 AM, Lokesh Vutla wrote: >>> >>> >>> On 5/11/2017 12:52 AM, Jagan Teki wrote: Hi Lokesh, On Tue, May 9, 2017 at 10:03 PM, Jagan Teki wrote: > On Tue, May 9, 2017 at 8:54 PM, Lokesh Vutla wrote: >> >> >> On Tuesday 09 May 2017 08:37 PM, Jagan Teki wrote: >>> On Tue, May 9, 2017 at 7:49 PM, Lokesh Vutla wrote: On Tuesday 09 May 2017 04:35 PM, Jagan Teki wrote: > Hi All, > > I'm trying to add SPL_OF_CONTROL for i.MX6UL, with usdhc1 and gpio1 > nodes are marking as "u-boot,dm-pre-reloc" like Did you try "u-boot,dm-spl" instead? >>> >>> Yes, no change. >> >> Hmm..Ideally this should have taken effect :( >> >>> > > --- a/arch/arm/dts/imx6ul.dtsi > +++ b/arch/arm/dts/imx6ul.dtsi > @@ -129,6 +129,7 @@ > }; > > soc { > + u-boot,dm-pre-reloc; > #address-cells = <1>; > #size-cells = <1>; > compatible = "simple-bus"; > @@ -180,6 +181,7 @@ > }; > > aips1: aips-bus@0200 { > + u-boot,dm-pre-reloc; > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -405,6 +407,7 @@ > }; > > gpio1: gpio@0209c000 { > + u-boot,dm-pre-reloc; > compatible = "fsl,imx6ul-gpio", > "fsl,imx35-gpio"; > reg = <0x0209c000 0x4000>; > interrupts = IRQ_TYPE_LEVEL_HIGH>, > @@ -724,6 +727,7 @@ > }; > > aips2: aips-bus@0210 { > + u-boot,dm-pre-reloc; > compatible = "fsl,aips-bus", "simple-bus"; > #address-cells = <1>; > #size-cells = <1>; > @@ -781,6 +785,7 @@ > }; > > usdhc1: usdhc@0219 { > + u-boot,dm-pre-reloc; > compatible = "fsl,imx6ul-usdhc", > "fsl,imx6sx-usdhc"; > reg = <0x0219 0x4000>; > interrupts = IRQ_TYPE_LEVEL_HIGH>; > > SPL is loading fine from MMC but block the U-Boot that means we can't > see U-Boot log on console. Any chance you can try enabling early debug? Since enabling pre-reloc is going for a toss, I guess your malloc size is going for a toss. Can you try increasing initial malloc size? >>> >>> Yes, I've increased malloc CONFIG_SYS_MALLOC_LEN from 16M to upto 128M >>> but no change. >> >> No, try CONFIG_SYS_MALLOC_F_LEN=0x2000. >> >> Is it possible to check where exactly is it hanged? > > Yes, it hangs while relocating dram[1] and I also observed the main > bus nodes are are 'not found' which I haven't see before and these are > marked 'u-boot,dm-spl' > > uclass_find_device_by_seq: 0 -1 > uclass_find_device_by_seq: 0 0 >- -1 -1 'soc' >- -1 -1 'aips-bus@0200' >- -1 -1 'aips-bus@0210' >- not found Any clue, I still investigating. Look like the node seq numbers which are marked as "u-boot,dm-spl" in SPL are checking before relocating in U-Boot, and they seems not found. Interestingly I couldn't see any panic or exception, the code ends board_f last line. >>> >>> Manfred posted a patch[1] stating a similar issue. See if it fixes it? >> >> It's not. I think this hanged at relocation assembly relocate_code or >> relocate_vectors. > > Any help on this, this look relocation is not possible in U-Boot with > 'u-boot,dm-pre-reloc' and incidentally removing property from /soc all > works fine. I don't have any idea based on the DM angle. I assume that you have called spi_init() correctly. That patch does seem useful though. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCHv4 2/2] lib: move hash CONFIG options to Kconfig
On 15 May 2017 at 10:17, Tom Riniwrote: > Commit 94e3c8c4fd7b ("crypto/fsl - Add progressive hashing support > using hardware acceleration.") created entries for CONFIG_SHA1, > CONFIG_SHA256, CONFIG_SHA_HW_ACCEL, and CONFIG_SHA_PROG_HW_ACCEL. > However, no defconfig has migrated to it. Complete the move by first > adding additional logic to various Kconfig files to select this when > required and then use the moveconfig tool. In many cases we can select > these because they are required to implement other drivers. We also > correct how we include the various hashing algorithms in SPL. > > This commit was generated as follows (after Kconfig additions): > > [1] tools/moveconfig.py -y SHA1 SHA256 SHA_HW_ACCEL > [2] tools/moveconfig.py -y SHA_PROG_HW_ACCEL > > Note: > We cannot move SHA_HW_ACCEL and SHA_PROG_HW_ACCEL simultaneously > because there is dependency between them. > > Cc: Poonam Aggrwal > Cc: Naveen Burmi > Cc: Po Liu > Cc: Shengzhou Liu > Cc: Priyanka Jain > Cc: Shaohui Xie > Cc: Chunhe Lan > Cc: Chander Kashyap > Cc: Steve Rae > Cc: Dirk Eibach > Cc: Feng Li > Cc: Alison Wang > Cc: Sumit Garg > Cc: Mingkai Hu > Cc: York Sun > Cc: Prabhakar Kushwaha > Cc: Jaehoon Chung > Cc: Akshay Saraswat > Cc: Simon Glass > Cc: Heiko Schocher > Cc: Jagan Teki > Signed-off-by: Tom Rini > --- > Changes in v4: > - Clean up README as well > - Re-sync defconfig changes (much less this time). > - select SHA_HW_ACCEL on ARCH_EXYNOS5. > Changes in v3: > - Take authorship, update commit message more to reflect how the > migration happened. > Changes in v2: > - Add a large number of select statements so that our overall delta > is fairly small. This is not size neutral but is I believe correct. > We had a number of cases before where we did not enable hw assist in > the hash command and only made use of it in certain back end locations. > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCHv4 1/2] FIT: Rename FIT_DISABLE_SHA256 to FIT_ENABLE_SHA256_SUPPORT
On 15 May 2017 at 10:17, Tom Riniwrote: > We rename CONFIG_FIT_DISABLE_SHA256 to CONFIG_FIT_ENABLE_SHA256_SUPPORT which > is enabled by default and now a positive option. Convert the handful of > boards > that were disabling it before to save space. > > Cc: Dirk Eibach > Cc: Lukasz Dalek > Signed-off-by: Tom Rini > Reviewed-by: Simon Glass > --- > Changes in v4: > - Fix HOST_CC side of changes to include/image.h so that the host tools > will continue to have SHA256 support. > --- > Kconfig| 13 + > README | 9 - > configs/dlvision-10g_defconfig | 1 + > configs/dlvision_defconfig | 1 + > configs/h2200_defconfig| 1 + > configs/io_defconfig | 1 + > configs/iocon_defconfig| 1 + > configs/neo_defconfig | 1 + > include/configs/dlvision-10g.h | 3 --- > include/configs/dlvision.h | 3 --- > include/configs/h2200.h| 1 - > include/configs/io.h | 3 --- > include/configs/iocon.h| 3 --- > include/configs/neo.h | 3 --- > include/image.h| 16 ++-- > scripts/config_whitelist.txt | 1 - > 16 files changed, 25 insertions(+), 36 deletions(-) > Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH] kbuild: update DTC warning settings for bus and node/property name checks
On 15 May 2017 at 01:07, Masahiro Yamadawrote: > Recent commits of DTC introduced new warnings checking PCI and simple > buses, unit address formatting, and stricter node and property name > checking. Disable the new DTC warnings by default. As before, > warnings are enabled with W=*. The strict node and property name > checks are a bit subjective, so they are only enabled for W=2. > (This policy reflects the commit 8654cb8d0371 of Linux.) > > Signed-off-by: Masahiro Yamada > --- > > scripts/Makefile.extrawarn | 14 ++ > 1 file changed, 14 insertions(+) Reviewed-by: Simon Glass ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 15/17] Kconfig: USB: Migrate CONFIG_USB_EHCI_HCD users to Kconfig
On Fri, May 12, 2017 at 10:33:28PM -0400, Tom Rini wrote: > Migrate the rest of the users of CONFIG_USB_EHCI_HCD over to Kconfig. > For a few SoCs, imply or default y this if USB is enabled. In some > cases we had not already migrated to CONFIG_USB so do that as well. > > Cc: Marek Vasut> Signed-off-by: Tom Rini > Reviewed-by: Marek Vasut Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 16/17] Kconfig: USB: Migrate existing USB_EHCI_xxx options
On Fri, May 12, 2017 at 10:33:29PM -0400, Tom Rini wrote: > The following options are migrated over fully now: > - USB_EHCI_ATMEL > - USB_EHCI_MARVELL > - USB_EHCI_MX6 > - USB_EHCI_MX7 > - USB_EHCI_MSM > - USB_EHCI_ZYNQ > - USB_EHCI_GENERIC > > This also requires fixing the depends on USB_EHCI_MARVELL as it's used > by Orion5X and Kirkwood as well. > > Cc: Marek Vasut> Signed-off-by: Tom Rini > Reviewed-by: Marek Vasut Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] kbuild: update DTC warning settings for bus and node/property name checks
On Mon, May 15, 2017 at 04:07:33PM +0900, Masahiro Yamada wrote: > Recent commits of DTC introduced new warnings checking PCI and simple > buses, unit address formatting, and stricter node and property name > checking. Disable the new DTC warnings by default. As before, > warnings are enabled with W=*. The strict node and property name > checks are a bit subjective, so they are only enabled for W=2. > (This policy reflects the commit 8654cb8d0371 of Linux.) > > Signed-off-by: Masahiro YamadaApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 14/17] Kconfig: USB: Migrate CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD
On Fri, May 12, 2017 at 10:33:27PM -0400, Tom Rini wrote: > In order to be able to migrate the various SoC EHCI CONFIG options we > first need to finish the switch from CONFIG_USB_EHCI to > CONFIG_USB_EHCI_HCD. > > Cc: Marek Vasut> Signed-off-by: Tom Rini > Reviewed-by: Marek Vasut Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,08/17] gpio: Move OMAP_GPIO to Kconfig
On Fri, May 12, 2017 at 10:33:21PM -0400, Tom Rini wrote: > This driver is used often enough such that we want to have this enabled > by default on any ARCH_OMAP2PLUS board, and this only compiles on > ARCH_OMAP2PLUS due to required defines, so mark that as the depends. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] power: twl4030: Add imply CMD_POWEROFF when TWL4030 is enabled
On Sat, May 13, 2017 at 07:02:24AM -0500, Adam Ford wrote: > Now that CMD_POWEROFF can turn off the twl4030, let's imply that > just incase someone wants to disable it. > > Signed-off-by: Adam Ford> Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 17/17] Kconfig: OMAP: USB: Migrate CONFIG_USB_EHCI_OMAP to Kconfig
On Fri, May 12, 2017 at 10:33:30PM -0400, Tom Rini wrote: > Follow the exiting logic for the i.MX options when migrating this > option. > > Cc: Marek Vasut> Signed-off-by: Tom Rini > Reviewed-by: Marek Vasut Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 13/17] whitelist: Drop more unused OMAP symbols
On Fri, May 12, 2017 at 10:33:26PM -0400, Tom Rini wrote: > The symbol CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID was recently dropped > from usage and CONFIG_OMAP3_MICRON_DDR is unused in code. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 11/17] watchdog: Migrate OMAP_WATCHDOG to Kconfig
On Fri, May 12, 2017 at 10:33:24PM -0400, Tom Rini wrote: > Move this entry to Kconfig. As it is a hardware watchdog, select > HW_WATCHDOG. While we could default to enabling this for all platforms, > it is currently only enabled by default on AM33XX, so keep that logic > today. > > Cc: Roger Meier> Signed-off-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 09/17] omap3: Migrate CONFIG_OMAP3_GPIO_X to Kconfig
On Fri, May 12, 2017 at 10:33:22PM -0400, Tom Rini wrote: > The symbols CONFIG_OMAP3_GPIO_X control if we enable the clocks for a > given GPIO bank in U-Boot. select the required banks for each target. > In some cases we need to also migrate from CONFIG_USB_EHCI (deprecated, > in include/configs/) to CONFIG_USB_EHCI_HCD as we only require the GPIO > bank to be enabled if USB is also enabled. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,03/17] TI: Drop 'CONFIG_OMAP'
On Fri, May 12, 2017 at 10:33:16PM -0400, Tom Rini wrote: > In the two cases in the code where we use CONFIG_OMAP as a useful test > currently we can make use of CONFIG_ARCH_OMAP2PLUS instead. With that > changed we can drop all defines of CONFIG_OMAP. While in here, > CONFIG_OMAP3430 is only defined and then never used, so drop. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 04/17] omap5: Migrate CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC to Kconfig
On Fri, May 12, 2017 at 10:33:17PM -0400, Tom Rini wrote: > While in theory this value could be used in places outside of "omap5" > (such as OMAP4), we only make use of it today in OMAP5, so place the > Kconfig entry there. Given that Kconfig lets us provide a default, we > drop CONFIG_DEFAULT_OMAP_RESET_TIME_MAX_USEC entirely. The contents of > doc/README.omap-reset-time make a good help entry, so adjust them > slightly and delete the file. Move the comment about range to where we > use the value now, and have Kconfig enforce the upper bound. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,12/17] omap: Drop CONFIG_OMAP_VC_I2C_HS_MCODE
On Fri, May 12, 2017 at 10:33:25PM -0400, Tom Rini wrote: > The symbol CONFIG_OMAP_VC_I2C_HS_MCODE always uses the default value. > Restructure the comment and code such that if a need arises later to use > another value we can address this then. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] omap3: omap3_logic: switch to using TI_COMMON_CMD_OPTION
On Sat, May 13, 2017 at 08:14:37AM -0500, Adam Ford wrote: > Enable TI_COMMON_CMD_OPTIONS and remove similar options > from the defconfig. Updated with savedefconfig > > CMD_USB isn't enabled yet. I have some testing to do with > musb. > > Signed-off-by: Adam Ford> Reviewed-by: Tom Rini > > diff --git a/board/logicpd/omap3som/Kconfig b/board/logicpd/omap3som/Kconfig > index 03d272a..68d40dc 100644 Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 10/17] omap: spi: Drop CONFIG_OMAP3_SPI_D0_D1_SWAPPED support
On Fri, May 12, 2017 at 10:33:23PM -0400, Tom Rini wrote: > This particular quirk is not enabled in any config files today. It does > however exist and is handled correctly in device trees and via > CONFIG_DM_SPI. So we drop the symbol now and add a comment to indicate > that any (new) boards that require this quirk need to enable DM_SPI > instead. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 06/17] omap4: Drop redundant CONFIG_OMAP4430 symbol
On Fri, May 12, 2017 at 10:33:19PM -0400, Tom Rini wrote: > While there are a few different OMAP4 SoCs, today we always set > CONFIG_OMAP4430 and CONFIG_OMAP44XX. Convert the few test of > CONFIG_OMAP4430 to CONFIG_OMAP44XX. > > Cc: Marek Vasut> Cc: Paul Kocialkowski > Signed-off-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,01/17] arch/arm/cpu/arm926ejs/omap: Remove
On Fri, May 12, 2017 at 10:33:14PM -0400, Tom Rini wrote: > This code has been unused since the removal of the "omap2" platforms, > remove. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot,v4] spl: add support to booting with ATF
On Fri, May 05, 2017 at 11:47:45AM +0800, Kever Yang wrote: > ATF(ARM Trusted Firmware) is used by ARM arch64 SoCs, find more infomation > about ATF at: https://github.com/ARM-software/arm-trusted-firmware > > SPL is considered as BL2 in ATF terminology, it needs to load other parts > of ATF binary like BL31, BL32, SCP-BL30, and BL33(U-Boot). And needs to > prepare the parameter for BL31 which including entry and image information > for all other images. Then the SPL handle PC to BL31 with the parameter, > the BL31 will do the rest of work and at last get into U-Boot(BL33). > > This patch needs work with patches from Andre for SPL support multi > binary in FIT. > > The entry point of bl31 and bl33 are still using hard code because we > still can not get them from the FIT image information. > > Signed-off-by: Kever Yang> Tested-by: Heiko Stuebner > Acked-by: Simon Glass > Reviewed-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 05/17] omap3: Drop CONFIG_OMAP3_EVM, switch to CONFIG_TARGET_OMAP3_EVM when needed
On Fri, May 12, 2017 at 10:33:18PM -0400, Tom Rini wrote: > We make use of CONFIG_OMAP3_EVM today to know when to do a specific > tweak in MUSB. This can be tested on via CONFIG_TARGET_OMAP3_EVM > instead, so switch there so we can drop the now unused symbol > CONFIG_OMAP3_EVM. In investigating what to do about the symbol usage we > see that the cairo board defines the same function, but never called it > (as it does not define CONFIG_OMAP3_EVM) and was just returning anyhow, > so drop that function from that board. > > Cc: "Albert ARIBAUD (3ADEV)"> Cc: Marek Vasut > Signed-off-by: Tom Rini Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 07/17] omap3: Drop unused CONFIG_OMAP3_xxx board defines
On Fri, May 12, 2017 at 10:33:20PM -0400, Tom Rini wrote: > We no longer have a need for a per-board CONFIG_OMAP3_xxx define (we > have CONFIG_TARGET_xxx when this is required), so drop these unused > references. > > Signed-off-by: Tom RiniApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] davinci: omapl138_lcdk: drop custom prompt string
On Fri, May 12, 2017 at 03:44:40PM +0530, Sekhar Nori wrote: > Drop custom command prompt string in favor > of default used by U-Boot. This helps in > easier automation setup across boards. > > Signed-off-by: Sekhar NoriApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [U-Boot, 02/17] omap24xx_i2c.c: Drop references to CONFIG_OMAP243X
On Fri, May 12, 2017 at 10:33:15PM -0400, Tom Rini wrote: > We have nothing defining CONFIG_OMAP243X since we dropped the omap243x > platforms, drop these tests. > > Signed-off-by: Tom Rini> Acked-by: Heiko Schocher Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] board_f: skip timer_init() on Coldfire archs
On Wed, May 10, 2017 at 11:58:06PM +0200, Angelo Dureghello wrote: > Coldfire arch is not happy with timer_init since interrupt handlers > are still not set at that stage, and the boot hangs silently. > > Signed-off-by: Angelo DureghelloApplied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Please pull from u-boot-i2c
On Mon, May 15, 2017 at 11:45:00AM +0200, Heiko Schocher wrote: > Hello Tom, > > please pull from u-boot-i2c.git master > > The following changes since commit 22f3368e71321db1e0e15dfbf54b052367890ec7: > > Merge branch 'master' of git://git.denx.de/u-boot-mips (2017-05-13 16:45:35 > -0400) > > are available in the git repository at: > > git://git.denx.de/u-boot-i2c.git master > > for you to fetch changes up to ce3b5d69112b1adc878e06586c1bc819414309be: > > Drop use of CONFIG_I2C_SOFT (2017-05-15 06:19:10 +0200) > Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] armv8: minor fix to comment for enabling SMPEN bit
On Wed, Apr 26, 2017 at 11:36:03PM -0500, Dinh Nguyen wrote: > The SMPEN bit is located in the cpuectlr_el1 register and not the > cpuactlr_el1 register. Adjust the comment accordingly and also fix > a spelling error. > > Signed-off-by: Dinh Nguyen> CC: Mingkai Hu > CC: Gong Qianyu > CC: Mateusz Kulikowski > CC: Hou Zhiqiang > CC: York Sun > CC: Albert Aribaud > CC: Masahiro Yamada > Reviewed-by: York Sun Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/2] env_mmc: configure environment offsets via device tree
Hi Jaehoon, I haven’t been able to reproduce this on any our configs, but I believe to have caught the issue: testing the OF_CONTROL using defined(CONFIG_OF_CONTROL) gives a false positive in the SPL build, as the SPL infrastructure does not undefine it … yet, lib/Makefile uses CONFIG_$(SPL_)OF_CONTROL to control the inclusion of fdtdec.o. Please let me know if the resubmitted (v4) series fixes the issue on the configurations that you see the error on. If not, I’d appreciate a pointer to one of the broken configurations so I can reproduce locally. Best regards, Philipp. > On 15 May 2017, at 23:33, Jaehoon Chungwrote: > > Hi Philipp, > > On 05/10/2017 09:44 PM, Philipp Tomsich wrote: >> This introduces the ability to override the environment offets from the >> device tree by setting the following nodes in '/config': >> 'u-boot,mmc-env-offset' - overrides CONFIG_ENV_OFFSET >> 'u-boot,mmc-env-offset-redundant' >> - overrides CONFIG_ENV_OFFSET_REDUND >> >> To keep with the previous logic, the CONFIG_* defines still need to >> be available and the statically defined values become the defaults, >> when the corresponding properties are not set in the device-tree. >> >> Signed-off-by: Philipp Tomsich >> Acked-by: Simon Glass > > your patch has the compile error about building spl. > > +common/built-in.o: In function `mmc_offset': > +common/env_mmc.c:53: undefined reference to `fdtdec_get_config_int' > +make[2]: *** [spl/u-boot-spl] Error 1 > +make[1]: *** [spl/u-boot-spl] Error 2 > +make: *** [sub-make] Error 2 > > Plz, fix this. > > > Best Regards, > Jaehoon Chung > >> --- >> >> Changes in v3: >> - changes the config-check to depend on CONFIG_OF_CONTROL to detect >> if 'fdtdec_get_config_int' is available >> >> Changes in v2: None >> >> common/env_mmc.c | 31 +++ >> 1 file changed, 27 insertions(+), 4 deletions(-) >> >> diff --git a/common/env_mmc.c b/common/env_mmc.c >> index a5d14d4..c10eec5 100644 >> --- a/common/env_mmc.c >> +++ b/common/env_mmc.c >> @@ -10,6 +10,7 @@ >> >> #include >> #include >> +#include >> #include >> #include >> #include >> @@ -36,15 +37,37 @@ DECLARE_GLOBAL_DATA_PTR; >> #define CONFIG_ENV_OFFSET 0 >> #endif >> >> -__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) >> +#if defined(CONFIG_OF_CONTROL) >> +static inline s64 mmc_offset(int copy) >> { >> -s64 offset; >> +const char *propname = "u-boot,mmc-env-offset"; >> +s64 defvalue = CONFIG_ENV_OFFSET; >> >> -offset = CONFIG_ENV_OFFSET; >> -#ifdef CONFIG_ENV_OFFSET_REDUND >> +#if defined(CONFIG_ENV_OFFSET_REDUND) >> +if (copy) { >> +propname = "u-boot,mmc-env-offset-redundant"; >> +defvalue = CONFIG_ENV_OFFSET_REDUND; >> +} >> +#endif >> + >> +return fdtdec_get_config_int(gd->fdt_blob, propname, defvalue); >> +} >> +#else >> +static inline s64 mmc_offset(int copy) >> +{ >> +s64 offset = CONFIG_ENV_OFFSET; >> + >> +#if defined(CONFIG_ENV_OFFSET_REDUND) >> if (copy) >> offset = CONFIG_ENV_OFFSET_REDUND; >> #endif >> +return offset; >> +} >> +#endif >> + >> +__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) >> +{ >> +s64 offset = mmc_offset(copy); >> >> if (offset < 0) >> offset += mmc->capacity; >> > ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v4 2/2] doc: document u-boot, mmc-env-offset and u-boot, mmc-env-offset-redund
Adding documentation on the new config properties: 'u-boot,mmc-env-offset' - overrides CONFIG_ENV_OFFSET 'u-boot,mmc-env-offset-redundant' - overrides CONFIG_ENV_OFFSET_REDUND Signed-off-by: Philipp Tomsich--- Changes in v4: None Changes in v3: None Changes in v2: - added documentation in config.txt doc/device-tree-bindings/config.txt | 12 1 file changed, 12 insertions(+) diff --git a/doc/device-tree-bindings/config.txt b/doc/device-tree-bindings/config.txt index d4bc1df..fe0e04a 100644 --- a/doc/device-tree-bindings/config.txt +++ b/doc/device-tree-bindings/config.txt @@ -21,6 +21,18 @@ u-boot,efi-partition-entries-offset This setting will override any values configured via Kconfig. +u-boot,mmc-env-offset +u-boot,mmc-env-offset-redundant + If present, the values of the 'u-boot,mmc-env-offset' and/or + of the u-boot,mmc-env-offset-redundant' properties overrides + CONFIG_ENV_OFFSET and CONFIG_ENV_OFFSET_REDUND, respectively, + for SD/MMC devices. + + Values are interpreted as the offset from the start of the + device, specified in bytes. It is assumed that the setting + will point at the beginning of a LBA and values that are not + LBA-aligned will be rounded up to the next LBA address. + u-boot,spl-payload-offset If present (and SPL is controlled by the device-tree), this allows to override the CONFIG_SYS_SPI_U_BOOT_OFFS setting using a value -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH v4 1/2] env_mmc: configure environment offsets via device tree
This introduces the ability to override the environment offets from the device tree by setting the following nodes in '/config': 'u-boot,mmc-env-offset' - overrides CONFIG_ENV_OFFSET 'u-boot,mmc-env-offset-redundant' - overrides CONFIG_ENV_OFFSET_REDUND To keep with the previous logic, the CONFIG_* defines still need to be available and the statically defined values become the defaults, when the corresponding properties are not set in the device-tree. Signed-off-by: Philipp TomsichAcked-by: Simon Glass --- Changes in v4: - change the test for OF_CONTROL to use CONFIG_IS_ENABLED to pick up the differece between SPL_OF_CONTROL and OF_CONTROL Changes in v3: - changes the config-check to depend on CONFIG_OF_CONTROL to detect if 'fdtdec_get_config_int' is available Changes in v2: None common/env_mmc.c | 31 +++ 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/common/env_mmc.c b/common/env_mmc.c index a5d14d4..45d95a1 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -36,15 +37,37 @@ DECLARE_GLOBAL_DATA_PTR; #define CONFIG_ENV_OFFSET 0 #endif -__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) +#if CONFIG_IS_ENABLED(OF_CONTROL) +static inline s64 mmc_offset(int copy) { - s64 offset; + const char *propname = "u-boot,mmc-env-offset"; + s64 defvalue = CONFIG_ENV_OFFSET; - offset = CONFIG_ENV_OFFSET; -#ifdef CONFIG_ENV_OFFSET_REDUND +#if defined(CONFIG_ENV_OFFSET_REDUND) + if (copy) { + propname = "u-boot,mmc-env-offset-redundant"; + defvalue = CONFIG_ENV_OFFSET_REDUND; + } +#endif + + return fdtdec_get_config_int(gd->fdt_blob, propname, defvalue); +} +#else +static inline s64 mmc_offset(int copy) +{ + s64 offset = CONFIG_ENV_OFFSET; + +#if defined(CONFIG_ENV_OFFSET_REDUND) if (copy) offset = CONFIG_ENV_OFFSET_REDUND; #endif + return offset; +} +#endif + +__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) +{ + s64 offset = mmc_offset(copy); if (offset < 0) offset += mmc->capacity; -- 1.9.1 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] Please pull u-boot-video/master
Hi Tom, The following changes since commit 22f3368e71321db1e0e15dfbf54b052367890ec7: Merge branch 'master' of git://git.denx.de/u-boot-mips (2017-05-13 16:45:35 -0400) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to 940aed8f6bacfc8c0dbaf9da0008e0a6a76463a8: sunxi: Add clock support for TV encoder (2017-05-15 21:22:57 +0200) Jernej Skrabec (5): edid: Set timings flags according to edid edid: Add HDMI flag to timing info video: dw_hdmi: Select HDMI mode only if monitor supports it sunxi: video: Split out TVE code sunxi: Add clock support for TV encoder Philipp Tomsich (2): rockchip: video: introduce VIDEO_DW_HDMI and select for Rockchip HDMI video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 8 +- arch/arm/include/asm/arch-sunxi/display.h | 107 - arch/arm/include/asm/arch-sunxi/tve.h | 131 ++ common/edid.c | 56 +++ common/lcd.c | 4 +- drivers/video/Kconfig | 9 ++ drivers/video/Makefile| 1 + drivers/video/dw_hdmi.c | 31 +++--- drivers/video/rockchip/Kconfig| 1 + drivers/video/rockchip/Makefile | 2 +- drivers/video/sunxi/Makefile | 2 +- drivers/video/sunxi/sunxi_display.c | 73 +++--- drivers/video/sunxi/tve.c | 86 + drivers/video/video_bmp.c | 4 +- include/configs/brxre1.h | 2 +- include/edid.h| 14 +++ include/fdtdec.h | 1 + scripts/config_whitelist.txt | 1 - 18 files changed, 341 insertions(+), 192 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/tve.h create mode 100644 drivers/video/sunxi/tve.c Please pull. Thanks! Anatolij ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v2] test: py: Add cmd_echo dependency
On 05/15/2017 06:29 AM, Michal Simek wrote: There is missing dependency on echo command. Mark tests which requires echo. Reviewed-by: Stephen WarrenIt'd be good to update test_hush_if_test.py too though, even if separately. ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] Bug in emmc subsystem
Hi Arno, On 05/02/2017 05:05 PM, Arno Steffens wrote: > Some news here. With help of Diego I found, that GP partition can be > addressed: > This works with > Zynq> mmc dev 0 4 > MMC: block number 0x1 exceeds max(0x0) > switch to partitions #4, OK > mmc0(part 4) is current device > > (0 is the user data area, 1 and 2 the first and second boot partitions, 3 the > RPMB partition and 4, 5, 6 and 7 the up to four general purpose partitions). > Still a potential problem is the message "MMC: block number 0x1 exceeds > max(0x0)" > > After that I can see the capacity: > Zynq> mmc info > Device: sdhci@e010 > Manufacturer ID: 13 > OEM: 14e > Name: Q1J54 > Tran Speed: 5200 > Rd Block Len: 512 > MMC version 5.0 > High Capacity: Yes > Capacity: 1.8 GiB > Bus Width: 4-bit > Erase Group Size: 512 KiB > HC WP Group Size: 8 MiB > User Capacity: 0 Bytes WRREL > Boot Capacity: 2 MiB ENH > RPMB Capacity: 512 KiB ENH > GP1 Capacity: 1.8 GiB ENH WRREL > > > But even after activating the GP partition a load fails, neither > load mmc 0:1 8000 /bin/busy nor > load mmc 0:4 8000 /bin/busy nor > load mmc 0:0 8000 /bin/busy give anything else back than > > ** Bad device size - mmc 0 ** > > And: "mmc info", shows that this command switches back to user mode, as > capacity is zero again. > > Even this seems not ok to me: > Zynq> mmc dev 0 4 > MMC: block number 0x1 exceeds max(0x0) > switch to partitions #4, OK > mmc0(part 4) is current device > > Zynq> mmc dev > MMC: block number 0x1 exceeds max(0x0) > switch to partitions #0, OK > mmc0(part 0) is current device > > It should just sow the partition, not set it again (without parameter) Sorry for late..I have known to reply to you..but when i checked my mailbox, it is waiting for sending in my mailbox. Really sorry this...It's my mistake...Well..I'm doing my target..i will share my results.. Best Regards, Jaehoon Chung > > > Best regards > Arno > > >> Gesendet: Freitag, 07. April 2017 um 04:07 Uhr >> Von: "Jaehoon Chung">> An: "Arno Steffens" >> Betreff: Re: [U-Boot] Bug in emmc subsystem >> >> Hi Arno, >> >> On 04/07/2017 04:36 AM, Arno Steffens wrote: >>> Dear Jeahoon Chung, >>> >>> I am in office earliest on Monday. >>> >>> From what I remember there is not much additional debug information to be >>> expected (from the code I have in mind). But I will check this to give you >>> as much support as I can. >>> Which files do you want me to enable debug and what command shall I send to >>> create useful information for you? >> >> If enabled CONFIG_DEBUG, maybe all debug message will be printed. >> I want to see the mmc command's debug message. >> >> Which u-boot version do you use? Well, i can't check in more detail on >> today. :) >> But i think this is not bug..because my all boards are working fine with >> SD-card and eMMC4.41/4.5/5.0. >> >> If it's bug in subsystem, maybe i might see the similar thing...but it's >> just assumption.. >> So i need to check whether it's really mmc subsystem bug or not. >> >>> >>> This board is a custom board - most eval boards have SDcard instead of >>> fixed emmc. >> >> Do you use SD-card? Not eMMC? >> >>> Is there any trick to get access to the GP partition? >>> I couldn't found something about this. >>> >>> So before converting to GP / pseudoSingleLevelCell-mode (to extend >>> reliablility) I accessed it with >>> “if ext4load mmc 0:1 ${addr_ld} /{file_name} … ”, but this doesn’t work >>> anymore - it returns with: ** Bad device size - mmc 0 ** >>> >>> But maybe I just have to use other command for accessing GP? >>> >>> Best regards >>> Arno >>> >>> >>> Am 06.04.2017 um 14:08 schrieb Jaehoon Chung: Hi, On 04/06/2017 03:55 AM, Arno Steffens wrote: > There seems to be a problem handling emmc with configured GP partition. > > Below the "mmc info". The problem might be that user capacity is > calculated/shown as "0". > At least it shows the GP1 partition with correct size - which is not the > case for "mmc hwpartition" - it denies its existence ;) > > Can someone help me to fix this? Which board do you use? It seems that the initializing mmc might be failed. After enabling debug option, share the log about mmc. Best Regards, Jaehoon Chung > > Thanks a lot. > - Arno > > >> mmc info > Device: sdhci at e010 > Manufacturer ID: 13 > OEM: 14e > Name: Q1J54 > Tran Speed: 5200 > Rd Block Len: 512 > MMC version 5.0 > High Capacity: Yes > Capacity: 0 Bytes > Bus Width: 4-bit > Erase Group Size: 512 KiB > HC WP Group Size: 8 MiB > User Capacity: 0 Bytes WRREL > Boot Capacity: 2 MiB ENH > RPMB Capacity: 512 KiB ENH > GP1 Capacity: 1.8 GiB ENH WRREL > >> mmc hwpartition > Partition configuration: > No enhanced user data area > No GP1 partition >
Re: [U-Boot] [PATCHv4 3/3] ARM64: poplar: hi3798cv200: u-boot support for Poplar 96Boards
On Fri, May 12, 2017 at 7:35 AM, Tom Riniwrote: > On Fri, May 12, 2017 at 10:16:52AM +0200, Jorge Ramirez wrote: >> On 05/12/2017 12:32 AM, Tom Rini wrote: >> >>u I am a bit lost at this point, could we recap please? >> >Sure. >> > >> >>let's see: I need to use the pl01x uart on an aarch64 platform and I >> >>dont need to enable any clocks for uboot in my SoC. Not now, >> >>unlikely ever. >> >> >> >>Doing what other boards have done to this date is no longer >> >>acceptable (ie platform data for the pl01x or using uboots "clock" >> >>property embedded in the hacked device trees) >> >The only thing we all agree on right now is that "clock" is wrong and >> >must be replaced. I've decided we need to discuss bringing in platform >> >data for pl01x. Once we resolve this, then you can re-spin the series >> >(and hopefully have the USB nodes be submitted to Linux too, since >> >they're the standard ones and, uh, should just enable USB on your board >> >in the kernel too..) Thanks! >> >> cool, that sounds great, thanks. >> >> yeah the usb nodes should be ready pretty soon, I have seen them >> circulating already. >> >> btw, what was it that triggered our discussion? it is not like any >> of the dts files for armv8 boards are verbatim copies of what you >> find in the kernel. > > They've gotten out of sync? Sigh.. I suppose this starts to push me > from the "keep them in the kernel" camp to "push them to a separate > authoritative repository" camp. What's wrong with the standalone DT tree[1] and importing that to u-boot periodically? I know folks would like a completely separate tree that's not "the Linux DT tree", but I don't see that happening any time soon. Do we have some Linuxisms in bindings, yes, but in general I think they are more the exception than rule and were things that went in with little review. These days I'm reviewing pretty much all bindings (not all dts files though), so I think it's less of a problem. Logistically, we could probably work out how to move bindings and dts files to a standalone repository as I could apply bindings and most dts files go thru arm-soc maintainers. My biggest concern with a separate repository is review because we would quickly loose any review that Linux subsystem maintainers do, and no one is beating down my door to help be a DT maintainer. Rob [1] git://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [GIT PULL V2] Please pull u-boot-mmc master
Dear Tom, Could you pull these patches into u-boot/master? (I have tested the buildman.) The following changes since commit 22f3368e71321db1e0e15dfbf54b052367890ec7: Merge branch 'master' of git://git.denx.de/u-boot-mips (2017-05-13 16:45:35 -0400) are available in the git repository at: git://git.denx.de/u-boot-mmc.git master for you to fetch changes up to b3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b: mmc: atmel_sdhci: Enable the quirk SDHCI_QUIRK_WAIT_SEND_CMD (2017-05-16 06:29:28 +0900) Jean-Jacques Hiblot (2): include: config: am335x: disable DM_MMC_OPS if DM_MMC is disabled drivers: omap_hsmmc: move to DM_MMC_OPS Masahiro Yamada (5): mmc: sdhci-cadence: import updates from Linux 4.12 sandbox_noblk_defconfig: disable CONFIG_GENERIC_MMC blanche_defconfig: enable CONFIG_MMC mmc: replace CONFIG_GENERIC_MMC with CONFIG_MMC mmc: descend into drivers/mmc only when CONFIG_MMC is enabled Wenyou Yang (2): mmc: sdhci: Fix maximum clock for programmable clock mode mmc: atmel_sdhci: Enable the quirk SDHCI_QUIRK_WAIT_SEND_CMD Makefile | 1 - arch/arm/Kconfig | 2 +- board/BuR/common/common.c | 2 +- board/bosch/shc/board.c| 2 +- board/compulab/cl-som-am57x/cl-som-am57x.c | 4 +- board/compulab/cm_t35/cm_t35.c | 4 +- board/compulab/cm_t3517/cm_t3517.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/corscience/tricorder/tricorder.c | 4 +- board/gumstix/duovero/duovero.c| 2 +- board/hisilicon/hikey/hikey.c | 2 +- board/isee/igep00x0/igep00x0.c | 4 +- board/logicpd/am3517evm/am3517evm.c| 2 +- board/logicpd/omap3som/omap3logic.c| 4 +- board/logicpd/zoom1/zoom1.c| 2 +- board/overo/overo.c| 4 +- board/pandora/pandora.c| 2 +- board/quipos/cairo/cairo.c | 2 +- board/samsung/arndale/arndale.c| 2 +- board/samsung/common/board.c | 2 +- board/samsung/common/misc.c| 4 +- board/samsung/goni/goni.c | 2 +- board/samsung/smdkv310/smdkv310.c | 2 +- board/sunxi/board.c| 2 +- board/technexion/tao3530/tao3530.c | 4 +- board/ti/am3517crane/am3517crane.c | 2 +- board/ti/am57xx/board.c| 2 +- board/ti/beagle/beagle.c | 4 +- board/ti/dra7xx/evm.c | 2 +- board/ti/evm/evm.c | 4 +- board/ti/ks2_evm/board_k2g.c | 2 +- board/ti/omap5_uevm/evm.c | 2 +- board/ti/panda/panda.c | 2 +- board/ti/sdp4430/sdp.c | 2 +- board/ti/ti814x/evm.c | 2 +- board/timll/devkit8000/devkit8000.c| 4 +- common/board_r.c | 4 +- common/spl/Kconfig | 4 +- configs/blanche_defconfig | 3 +- configs/sandbox_noblk_defconfig| 1 - drivers/Makefile | 1 + drivers/mmc/Kconfig| 5 +-- drivers/mmc/Makefile | 28 ++--- drivers/mmc/atmel_sdhci.c | 4 +- drivers/mmc/davinci_mmc.c | 2 +- drivers/mmc/omap_hsmmc.c | 39 + drivers/mmc/sdhci-cadence.c| 67 +- drivers/mmc/sdhci.c| 18 include/configs/am335x_evm.h | 2 + include/configs/am335x_shc.h | 1 + include/configs/chiliboard.h | 1 + 51 files changed, 172 insertions(+), 101 deletions(-) Best Regards, Jaehoon Chung ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH v3 1/2] env_mmc: configure environment offsets via device tree
Hi Philipp, On 05/10/2017 09:44 PM, Philipp Tomsich wrote: > This introduces the ability to override the environment offets from the > device tree by setting the following nodes in '/config': > 'u-boot,mmc-env-offset' - overrides CONFIG_ENV_OFFSET > 'u-boot,mmc-env-offset-redundant' > - overrides CONFIG_ENV_OFFSET_REDUND > > To keep with the previous logic, the CONFIG_* defines still need to > be available and the statically defined values become the defaults, > when the corresponding properties are not set in the device-tree. > > Signed-off-by: Philipp Tomsich> Acked-by: Simon Glass your patch has the compile error about building spl. +common/built-in.o: In function `mmc_offset': +common/env_mmc.c:53: undefined reference to `fdtdec_get_config_int' +make[2]: *** [spl/u-boot-spl] Error 1 +make[1]: *** [spl/u-boot-spl] Error 2 +make: *** [sub-make] Error 2 Plz, fix this. Best Regards, Jaehoon Chung > --- > > Changes in v3: > - changes the config-check to depend on CONFIG_OF_CONTROL to detect > if 'fdtdec_get_config_int' is available > > Changes in v2: None > > common/env_mmc.c | 31 +++ > 1 file changed, 27 insertions(+), 4 deletions(-) > > diff --git a/common/env_mmc.c b/common/env_mmc.c > index a5d14d4..c10eec5 100644 > --- a/common/env_mmc.c > +++ b/common/env_mmc.c > @@ -10,6 +10,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -36,15 +37,37 @@ DECLARE_GLOBAL_DATA_PTR; > #define CONFIG_ENV_OFFSET 0 > #endif > > -__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) > +#if defined(CONFIG_OF_CONTROL) > +static inline s64 mmc_offset(int copy) > { > - s64 offset; > + const char *propname = "u-boot,mmc-env-offset"; > + s64 defvalue = CONFIG_ENV_OFFSET; > > - offset = CONFIG_ENV_OFFSET; > -#ifdef CONFIG_ENV_OFFSET_REDUND > +#if defined(CONFIG_ENV_OFFSET_REDUND) > + if (copy) { > + propname = "u-boot,mmc-env-offset-redundant"; > + defvalue = CONFIG_ENV_OFFSET_REDUND; > + } > +#endif > + > + return fdtdec_get_config_int(gd->fdt_blob, propname, defvalue); > +} > +#else > +static inline s64 mmc_offset(int copy) > +{ > + s64 offset = CONFIG_ENV_OFFSET; > + > +#if defined(CONFIG_ENV_OFFSET_REDUND) > if (copy) > offset = CONFIG_ENV_OFFSET_REDUND; > #endif > + return offset; > +} > +#endif > + > +__weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) > +{ > + s64 offset = mmc_offset(copy); > > if (offset < 0) > offset += mmc->capacity; > ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 3/3] MIPS: add BMIPS Sagem F@ST1704 board
Signed-off-by: Álvaro Fernández Rojas--- arch/mips/dts/Makefile | 1 + arch/mips/dts/sagem,f...@st1704.dts | 50 arch/mips/mach-bmips/Kconfig | 6 arch/mips/mach-bmips/include/ioremap.h | 3 +- board/sagem/f@st1704/Kconfig | 12 board/sagem/f@st1704/MAINTAINERS | 6 board/sagem/f@st1704/Makefile | 5 board/sagem/f@st1704/f@st1704.c| 7 + configs/sagem_f@st1704_ram_defconfig | 52 ++ include/configs/sagem_f@st1704.h | 15 ++ 10 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/sagem,f...@st1704.dts create mode 100644 board/sagem/f@st1704/Kconfig create mode 100644 board/sagem/f@st1704/MAINTAINERS create mode 100644 board/sagem/f@st1704/Makefile create mode 100644 board/sagem/f@st1704/f@st1704.c create mode 100644 configs/sagem_f@st1704_ram_defconfig create mode 100644 include/configs/sagem_f@st1704.h diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile index fdce645..a190485 100644 --- a/arch/mips/dts/Makefile +++ b/arch/mips/dts/Makefile @@ -13,6 +13,7 @@ dtb-$(CONFIG_BOARD_COMTREND_CT5361) += comtrend,ct-5361.dtb dtb-$(CONFIG_BOARD_COMTREND_VR3032U) += comtrend,vr-3032u.dtb dtb-$(CONFIG_BOARD_HUAWEI_HG556A) += huawei,hg556a.dtb dtb-$(CONFIG_BOARD_NETGEAR_CG3100D) += netgear,cg3100d.dtb +dtb-$(CONFIG_BOARD_SAGEM_FAST1704) += sagem,f...@st1704.dtb dtb-$(CONFIG_BOARD_TPLINK_WDR4300) += tplink_wdr4300.dtb targets += $(dtb-y) diff --git a/arch/mips/dts/sagem,f...@st1704.dts b/arch/mips/dts/sagem,f...@st1704.dts new file mode 100644 index 000..be15fe5 --- /dev/null +++ b/arch/mips/dts/sagem,f...@st1704.dts @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2017 Álvaro Fernández Rojas + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +/dts-v1/; + +#include "brcm,bcm6338.dtsi" + +/ { + model = "Sagem F@ST1704"; + compatible = "sagem,f@st1704", "brcm,bcm6338"; + + aliases { + serial0 = + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + gpio-leds { + compatible = "gpio-leds"; + + inet_green { + label = "F@ST1704:green:inet"; + gpios = < 0 GPIO_ACTIVE_LOW>; + }; + + power_green { + label = "F@ST1704:green:power"; + gpios = < 1 GPIO_ACTIVE_LOW>; + }; + + inet_red { + label = "F@ST1704:red:inet"; + gpios = < 2 GPIO_ACTIVE_LOW>; + }; + }; +}; + + { + status = "okay"; +}; + + { + u-boot,dm-pre-reloc; + status = "okay"; +}; diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig index c2b5abc..5454405 100644 --- a/arch/mips/mach-bmips/Kconfig +++ b/arch/mips/mach-bmips/Kconfig @@ -109,6 +109,11 @@ config BOARD_NETGEAR_CG3100D depends on SOC_BMIPS_BCM3380 select BMIPS_SUPPORTS_BOOT_RAM +config BOARD_SAGEM_FAST1704 + bool "Sagem F@ST1704" + depends on SOC_BMIPS_BCM6338 + select BMIPS_SUPPORTS_BOOT_RAM + config BOARD_SFR_NB4_SER bool "SFR NeufBox 4 (Sercomm)" depends on SOC_BMIPS_BCM6358 @@ -137,6 +142,7 @@ source "board/comtrend/ct5361/Kconfig" source "board/comtrend/vr3032u/Kconfig" source "board/huawei/hg556a/Kconfig" source "board/netgear/cg3100d/Kconfig" +source "board/sagem/f@st1704/Kconfig" source "board/sfr/nb4_ser/Kconfig" endmenu diff --git a/arch/mips/mach-bmips/include/ioremap.h b/arch/mips/mach-bmips/include/ioremap.h index d3dc0b8..a57f55d 100644 --- a/arch/mips/mach-bmips/include/ioremap.h +++ b/arch/mips/mach-bmips/include/ioremap.h @@ -18,7 +18,8 @@ static inline phys_addr_t fixup_bigphys_addr(phys_addr_t phys_addr, static inline int is_bmips_internal_registers(phys_addr_t offset) { -#if defined(CONFIG_SOC_BMIPS_BCM6348) || \ +#if defined(CONFIG_SOC_BMIPS_BCM6338) || \ + defined(CONFIG_SOC_BMIPS_BCM6348) || \ defined(CONFIG_SOC_BMIPS_BCM6358) if (offset >= 0xfffe) return 1; diff --git a/board/sagem/f@st1704/Kconfig b/board/sagem/f@st1704/Kconfig new file mode 100644 index 000..4566fcc --- /dev/null +++ b/board/sagem/f@st1704/Kconfig @@ -0,0 +1,12 @@ +if BOARD_SAGEM_FAST1704 + +config SYS_BOARD + default "f@st1704" + +config SYS_VENDOR + default "sagem" + +config SYS_CONFIG_NAME + default "sagem_f@st1704" + +endif diff --git a/board/sagem/f@st1704/MAINTAINERS b/board/sagem/f@st1704/MAINTAINERS new file mode 100644 index 000..72e1c5c --- /dev/null +++ b/board/sagem/f@st1704/MAINTAINERS @@ -0,0 +1,6 @@ +SAGEM F@ST1704 BOARD +M: Álvaro Fernández Rojas +S: Maintained +F: board/sagem/f@st1704/ +F: include/configs/sagem_f@st1704.h
[U-Boot] [PATCH 2/3] MIPS: add support for Broadcom MIPS BCM6338 SoC family
Signed-off-by: Álvaro Fernández Rojas--- arch/mips/dts/brcm,bcm6338.dtsi | 118 ++ arch/mips/mach-bmips/Kconfig | 12 +++ include/configs/bmips_bcm6338.h | 30 include/dt-bindings/clock/bcm6338-clock.h | 19 + include/dt-bindings/reset/bcm6338-reset.h | 22 ++ 5 files changed, 201 insertions(+) create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi create mode 100644 include/configs/bmips_bcm6338.h create mode 100644 include/dt-bindings/clock/bcm6338-clock.h create mode 100644 include/dt-bindings/reset/bcm6338-reset.h diff --git a/arch/mips/dts/brcm,bcm6338.dtsi b/arch/mips/dts/brcm,bcm6338.dtsi new file mode 100644 index 000..eb51a43 --- /dev/null +++ b/arch/mips/dts/brcm,bcm6338.dtsi @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2017 Álvaro Fernández Rojas + * + * SPDX-License-Identifier:GPL-2.0+ + */ + +#include +#include +#include +#include "skeleton.dtsi" + +/ { + compatible = "brcm,bcm6338"; + + cpus { + reg = <0xfffe 0x4>; + #address-cells = <1>; + #size-cells = <0>; + u-boot,dm-pre-reloc; + + cpu@0 { + compatible = "brcm,bcm6338-cpu", "mips,mips4Kc"; + device_type = "cpu"; + reg = <0>; + u-boot,dm-pre-reloc; + }; + }; + + clocks { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + u-boot,dm-pre-reloc; + + periph_osc: periph-osc { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <5000>; + u-boot,dm-pre-reloc; + }; + + periph_clk: periph-clk { + compatible = "brcm,bcm6345-clk"; + reg = <0xfffe0004 0x4>; + #clock-cells = <1>; + }; + }; + + pflash: nor@1fc0 { + compatible = "cfi-flash"; + reg = <0x1fc0 0x40>; + bank-width = <2>; + #address-cells = <1>; + #size-cells = <1>; + + status = "disabled"; + }; + + ubus { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + u-boot,dm-pre-reloc; + + pll_cntl: syscon@fffe0008 { + compatible = "syscon"; + reg = <0xfffe0008 0x4>; + }; + + syscon-reboot { + compatible = "syscon-reboot"; + regmap = <_cntl>; + offset = <0x0>; + mask = <0x1>; + }; + + periph_rst: reset-controller@fffe0028 { + compatible = "brcm,bcm6345-reset"; + reg = <0xfffe0028 0x4>; + #reset-cells = <1>; + }; + + wdt: watchdog@fffe021c { + compatible = "brcm,bcm6345-wdt"; + reg = <0xfffe021c 0xc>; + clocks = <_osc>; + }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <>; + }; + + uart0: serial@fffe0300 { + compatible = "brcm,bcm6345-uart"; + reg = <0xfffe0300 0x18>; + clocks = <_osc>; + + status = "disabled"; + }; + + gpio: gpio-controller@fffe0404 { + compatible = "brcm,bcm6345-gpio"; + reg = <0xfffe0404 0x4>, <0xfffe040c 0x4>; + gpio-controller; + #gpio-cells = <2>; + ngpios = <8>; + + status = "disabled"; + }; + + memory-controller@fffe3100 { + compatible = "brcm,bcm6338-mc"; + reg = <0xfffe3100 0x38>; + u-boot,dm-pre-reloc; + }; + }; +}; diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig index a843fda..c2b5abc 100644 --- a/arch/mips/mach-bmips/Kconfig +++ b/arch/mips/mach-bmips/Kconfig @@ -4,6 +4,7 @@ menu "Broadcom MIPS platforms" config SYS_SOC default "bcm3380" if SOC_BMIPS_BCM3380 default "bcm6328" if SOC_BMIPS_BCM6328 + default "bcm6338" if SOC_BMIPS_BCM6338 default "bcm6348" if SOC_BMIPS_BCM6348 default "bcm6358" if SOC_BMIPS_BCM6358 default "bcm63268" if SOC_BMIPS_BCM63268 @@ -33,6 +34,17 @@ config SOC_BMIPS_BCM6328 help This supports BMIPS BCM6328 family
[U-Boot] [PATCH 1/3] dm: cpu: bmips: add BCM6338 support
BCM6338 has a fixed CPU frequency of 240 MHz. Signed-off-by: Álvaro Fernández Rojas--- drivers/cpu/bmips_cpu.c | 14 ++ 1 file changed, 14 insertions(+) diff --git a/drivers/cpu/bmips_cpu.c b/drivers/cpu/bmips_cpu.c index 4f412fa..07a873a 100644 --- a/drivers/cpu/bmips_cpu.c +++ b/drivers/cpu/bmips_cpu.c @@ -128,6 +128,11 @@ static ulong bcm6328_get_cpu_freq(struct bmips_cpu_priv *priv) } } +static ulong bcm6338_get_cpu_freq(struct bmips_cpu_priv *priv) +{ + return 24000; +} + static ulong bcm6348_get_cpu_freq(struct bmips_cpu_priv *priv) { unsigned int tmp, n1, n2, m1; @@ -207,6 +212,12 @@ static const struct bmips_cpu_hw bmips_cpu_bcm6328 = { .get_cpu_count = bcm6328_get_cpu_count, }; +static const struct bmips_cpu_hw bmips_cpu_bcm6338 = { + .get_cpu_desc = bmips_short_cpu_desc, + .get_cpu_freq = bcm6338_get_cpu_freq, + .get_cpu_count = bcm6345_get_cpu_count, +}; + static const struct bmips_cpu_hw bmips_cpu_bcm6348 = { .get_cpu_desc = bmips_short_cpu_desc, .get_cpu_freq = bcm6348_get_cpu_freq, @@ -307,6 +318,9 @@ static const struct udevice_id bmips_cpu_ids[] = { .compatible = "brcm,bcm6328-cpu", .data = (ulong)_cpu_bcm6328, }, { + .compatible = "brcm,bcm6338-cpu", + .data = (ulong)_cpu_bcm6338, + }, { .compatible = "brcm,bcm6348-cpu", .data = (ulong)_cpu_bcm6348, }, { -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
[U-Boot] [PATCH 0/3] mips: bmips: add BCM6338 SoC support
BCM6338 is one of the first BCM63xx SoCs and prior to BCM6348/BCM6358, which means that it also needs ioremap "hacks". Álvaro Fernández Rojas (3): dm: cpu: bmips: add BCM6338 support MIPS: add support for Broadcom MIPS BCM6338 SoC family MIPS: add BMIPS Sagem F@ST1704 board arch/mips/dts/Makefile| 1 + arch/mips/dts/brcm,bcm6338.dtsi | 118 ++ arch/mips/dts/sagem,f...@st1704.dts | 50 + arch/mips/mach-bmips/Kconfig | 18 + arch/mips/mach-bmips/include/ioremap.h| 3 +- board/sagem/f@st1704/Kconfig | 12 +++ board/sagem/f@st1704/MAINTAINERS | 6 ++ board/sagem/f@st1704/Makefile | 5 ++ board/sagem/f@st1704/f@st1704.c | 7 ++ configs/sagem_f@st1704_ram_defconfig | 52 + drivers/cpu/bmips_cpu.c | 14 include/configs/bmips_bcm6338.h | 30 include/configs/sagem_f@st1704.h | 15 include/dt-bindings/clock/bcm6338-clock.h | 19 + include/dt-bindings/reset/bcm6338-reset.h | 22 ++ 15 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 arch/mips/dts/brcm,bcm6338.dtsi create mode 100644 arch/mips/dts/sagem,f...@st1704.dts create mode 100644 board/sagem/f@st1704/Kconfig create mode 100644 board/sagem/f@st1704/MAINTAINERS create mode 100644 board/sagem/f@st1704/Makefile create mode 100644 board/sagem/f@st1704/f@st1704.c create mode 100644 configs/sagem_f@st1704_ram_defconfig create mode 100644 include/configs/bmips_bcm6338.h create mode 100644 include/configs/sagem_f@st1704.h create mode 100644 include/dt-bindings/clock/bcm6338-clock.h create mode 100644 include/dt-bindings/reset/bcm6338-reset.h -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] LS2080ARDB: Secure Boot defconfig for QSPI boot.
On 05/02/2017 05:15 AM, Udit Agarwal wrote: > Add the secure boot defconfig for QSPI boot on LS2088ARDB > platform. > > Signed-off-by: Udit Agarwal> --- > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F756222%2F=01%7C01%7Cyork.sun%40nxp.com%7Cbb4048d4e8f54f7a92f108d49154f10c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0=Y%2BHozPqSb6MSs9t3rUXi%2FLbDJ3Yups0eSk876rv2VPE%3D=0 > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F756221%2F=01%7C01%7Cyork.sun%40nxp.com%7Cbb4048d4e8f54f7a92f108d49154f10c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0=vGcpFar3OLsspPz7%2FWlHz45NE2u%2BDuqDriVs%2FTnFrf8%3D=0 > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwork.ozlabs.org%2Fpatch%2F756250%2F=01%7C01%7Cyork.sun%40nxp.com%7Cbb4048d4e8f54f7a92f108d49154f10c%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0=mmux45TOPLFMRxdP3MdD8a%2FGpQABsulOM%2BJiFMNd3%2FY%3D=0 > > configs/ls2088ardb_qspi_SECURE_BOOT_defconfig | 50 > +++ > 1 file changed, 50 insertions(+) > create mode 100644 configs/ls2088ardb_qspi_SECURE_BOOT_defconfig > > diff --git a/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig > b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig > new file mode 100644 > index 000..749ad1d > --- /dev/null > +++ b/configs/ls2088ardb_qspi_SECURE_BOOT_defconfig > @@ -0,0 +1,50 @@ > +CONFIG_ARM=y > +CONFIG_TARGET_LS2080ARDB=y > +CONFIG_SECURE_BOOT=y > +CONFIG_FSL_LS_PPA=y > +CONFIG_QSPI_AHB_INIT=y > +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls2088a-rdb-qspi" > +# CONFIG_SYS_MALLOC_F is not set > +CONFIG_FIT_VERBOSE=y > +CONFIG_OF_BOARD_SETUP=y > +CONFIG_OF_STDOUT_VIA_ALIAS=y > +CONFIG_SYS_EXTRA_OPTIONS="LS2080A" This is not needed, and not allowed. Please fix. Make sure you test your patches on the top of latest upstream master branch. York ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [linux-sunxi] Re: [PATCH 3/3] sunxi: video: Add H3/H5 TV out driver
Hi, Dne ponedeljek, 15. maj 2017 ob 08:31:22 CEST je Maxime Ripard napisal(a): > On Sat, May 13, 2017 at 11:14:00PM +0800, Chen-Yu Tsai wrote: > > >>> +static int sunxi_tve_get_plug_in_status(void) > > >>> +{ > > >>> + struct sunxi_tve_reg * const tve = > > >>> + (struct sunxi_tve_reg *)SUNXI_TVE0_BASE; > > >>> + u32 status; > > >>> + > > >>> + status = readl(>auto_detect_status) & > > >>> + SUNXI_TVE_AUTO_DETECT_STATUS_MASK(0); > > >>> + > > >>> + return status == SUNXI_TVE_AUTO_DETECT_STATUS_CONNECTED; > > > > > > So TVE is now capable of hpd checking, right? > > > > > > Is is a feature that exists in A10/A13/A20 or is it new in H3? > > > > AFAIK this is also available in the earlier SoCs. > > Maxime mentioned that it was unreliable though. > > This was supposed to be there, but those registers were > undocumented. It would be nice to try to see if it works. AFAIK, H3 and newer SoCs with TV out have two additional registers for hot plug detection. Here are named SUNXI_TVE_AUTO_DETECT_CFG0 and SUNXI_TVE_AUTO_DETECT_CFG1 and they are somewhat explained in R40 manual. I'm not sure if this changes reliability a lot or not. Best regards, Jernej ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 3/3] sunxi: video: Add H3/H5 TV out driver
Hi, On Mon, 15 May 2017 21:47:57 +0200 Jernej Škrabec jernej.skra...@siol.net wrote: ... > > > >> drivers/video/sunxi/tve.c > > > >> | 6 +- > > > > > > > > The difference between sunxi_tve and tve is not really obvious. What > > > > about calling sunxi_tve tve-uclass, or something like that? > > > > > > That name is reserved for actual uclasses. > > > > Ok. How are the driver-part usually called? > > I wanted to suggest that common part should be renamed to tve_common.c, but > Anatolij already merged the patch. I'm ok with renaming it to tve_common.c. If no one has any objections, please send a renaming patch and base the rework of patch 3/3 on it. Thanks! -- Anatolij ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] sunxi: video: Split out TVE code
On Wed, 10 May 2017 18:46:28 +0200 Jernej Skrabec jernej.skra...@siol.net wrote: > Newer SoCs use same TV encoder unit. Split it out so it can be reused > with new DM video driver. > > Signed-off-by: Jernej Skrabec> --- > > arch/arm/include/asm/arch-sunxi/display.h | 107 > arch/arm/include/asm/arch-sunxi/tve.h | 131 > ++ > drivers/video/sunxi/Makefile | 2 +- > drivers/video/sunxi/sunxi_display.c | 73 +++-- > drivers/video/sunxi/tve.c | 86 > 5 files changed, 230 insertions(+), 169 deletions(-) > create mode 100644 arch/arm/include/asm/arch-sunxi/tve.h > create mode 100644 drivers/video/sunxi/tve.c applied to u-boot-video/master, thanks! -- Anatolij ___ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot