January 2018 - U-Boot

[U-Boot] [PATCH 1/1] efi_loader: efi_smbios_register should have a return value
by Heinrich Schuchardt 31 Jan '18

31 Jan '18

Errors may occur inside efi_smbios_register(). - Return a status code. - Remove unused variables. - Use constants where applicable. Suggested-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_loader.h | 2 +- lib/efi_loader/efi_smbios.c | 18 ++++++++++++------ lib/smbios.c | 2 ++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 21c03c5c28..eb86853924 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -185,7 +185,7 @@ int efi_net_register(void); /* Called by bootefi to make the watchdog available */ int efi_watchdog_register(void); /* Called by bootefi to make SMBIOS tables available */ -void efi_smbios_register(void); +efi_status_t efi_smbios_register(void); struct efi_simple_file_system_protocol * efi_fs_from_path(struct efi_device_path *fp); diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c index 67f71892ca..62e9697902 100644 --- a/lib/efi_loader/efi_smbios.c +++ b/lib/efi_loader/efi_smbios.c @@ -13,16 +13,22 @@ static const efi_guid_t smbios_guid = SMBIOS_TABLE_GUID; +/* + * Install the SMBIOS table as a configuration table. + * + * @return status code + */ efi_status_t efi_smbios_register(void) { /* Map within the low 32 bits, to allow for 32bit SMBIOS tables */ - uint64_t dmi = 0xffffffff; - /* Reserve 4kb for SMBIOS */ - uint64_t pages = 1; - int memtype = EFI_RUNTIME_SERVICES_DATA; + u64 dmi = U32_MAX; + efi_status_t ret; - if (efi_allocate_pages(1, memtype, pages, &dmi) != EFI_SUCCESS) - return EFI_OUT_OF_RESOURCES; + /* Reserve 4kiB page for SMBIOS */ + ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS, + EFI_RUNTIME_SERVICES_DATA, 1, &dmi); + if (ret != EFI_SUCCESS) + return ret; /* Generate SMBIOS tables */ write_smbios_table(dmi); diff --git a/lib/smbios.c b/lib/smbios.c index 8f19ad89c1..5389ca66e7 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -301,5 +301,7 @@ ulong write_smbios_table(ulong addr) se->intermediate_checksum = table_compute_checksum(istart, isize); se->checksum = table_compute_checksum(se, sizeof(struct smbios_entry)); + printf("smbios table size: %d\n", isize); + return addr; } -- 2.11.0

2 3

[U-Boot] U-Boot Operation on Xilinx Zynq SoC with Micro C
by Nelson Silva 31 Jan '18

31 Jan '18

Hello, I have a rather specific question about u-boot. I am working with a Xilinx Zynq SoC, and am running a MicroC OS executable file. It is running on UCOS kernel II. I notice different behavior when I hand off from the first stage boot loader to the UCOS application directly than when I hand off to u-boot and then use it to load the image. I am sure my methodology is correct as for other images it works fine, but not this one. I am concerned that the problem is related to the actual memory that u-boot is loading the application which has hard-coded memory blocks. Is there a way to ensure that u-boot hands off to the application the same way as the FSBL? For example, when I tell u-boot to load to address 0x0, is it the same 0x0 that the FSBL loads to? Any help is appreciated. -- Best regards, Nelson Silva System Engineer ADVANCED GEOLOCATION SOLUTIONS, LLC. 21515 Ridgetop Circle Suite 390 Sterling, VA. 20166 PH 703-955-3090 Ext 406

1 0

[U-Boot] EFI helloworld build fails with new compilers
by Andre Przywara 31 Jan '18

31 Jan '18

Hi, after building the just released GCC 7.3.0 compiler I get the below failure when building U-Boot. This is when building the EFI helloworld example, which seems to be enabled by default. Manually disabling CONFIG_CMD_BOOTEFI_HELLO_COMPILE fixes the U-Boot build (but of course doesn't fix that particular problem). I see this with origin/master, v2018.01 and v2017.11, but only with GCC 6.4.0 and 7.3.0, but not with 7.1.0. So I guess it's the compiler that got more picky. The splat is: ============= aarch64-linux-ld.bfd: arch/arm/lib/crt0_aarch64_efi.o: relocation R_AARCH64_ABS16 against `EFI_SUBSYSTEM' can not be used when making a shared object scripts/Makefile.lib:399: recipe for target 'lib/efi_loader/helloworld_efi.so' failed ============= It's beyond me at the moment what causes this or how to fix it, but I hope you guys can find a solution? Cheers, Andre.

1 0

[U-Boot] [PATCH 0/4] env: cleanups after adding multiple envs
by Simon Goldschmidt 31 Jan '18

31 Jan '18

With the new code to support multiple environment drivers and select an environment at runtime, to correctly implement fallback when one environment fails to load (e.g. crc error), the return value of env_import has to be propagated by all env driver's load function. While cleaning this up, made some other cleanups, mainly to reduce duplicated code. Simon Goldschmidt (4): env: make env_import(_redund) return 0 on success, not 1 env: move more common code to env_import_redund env: make env drivers propagate env_import return value env: sf: use env_import_redund to simplify env_sf_load env/common.c | 29 ++++++++++++++++++---- env/eeprom.c | 4 +-- env/ext4.c | 3 +-- env/fat.c | 3 +-- env/flash.c | 4 +-- env/mmc.c | 26 +++---------------- env/nand.c | 24 +++--------------- env/nvram.c | 4 +-- env/onenand.c | 4 +-- env/remote.c | 2 +- env/sata.c | 4 +-- env/sf.c | 69 +++++++-------------------------------------------- env/ubi.c | 22 ++++++++-------- include/environment.h | 3 ++- 14 files changed, 61 insertions(+), 140 deletions(-) -- 2.11.0 Pepperl+Fuchs GmbH, Mannheim Geschaeftsfuehrer/Managing Directors: Dr.-Ing. Gunther Kegel (Vors./CEO), Werner Guthier, Mehmet Hatiboglu Vorsitzender des Aufsichtsrats/Chairman of the supervisory board: Claus Michael Registergericht/Register Court: AG Mannheim HRB 4713 Wichtiger Hinweis: Diese E-Mail einschliesslich ihrer Anhaenge enthaelt vertrauliche und rechtlich geschuetzte Informationen, die nur fuer den Adressaten bestimmt sind. Sollten Sie nicht der bezeichnete Adressat sein, so teilen Sie dies bitte dem Absender umgehend mit und loeschen Sie diese Nachricht und ihre Anhaenge. Die unbefugte Weitergabe, das Anfertigen von Kopien und jede Veraenderung der E-Mail ist untersagt. Der Absender haftet nicht fuer Inhalte von veraenderten E-Mails. Important Information: This e-mail message including its attachments contains confidential and legally protected information solely intended for the addressee. If you are not the intended addressee of this message, please contact the addresser immediately and delete this message including its attachments. The unauthorized dissemination, copying and change of this e-mail are strictly forbidden. The addresser shall not be liable for the content of such changed e-mails.

1 5

[U-Boot] [PATCH v3 00/15] RPi: Properly handle dynamic serial configuration
by Alexander Graf 31 Jan '18

31 Jan '18

The RPi has proprietary firmware that can be configured (using config.txt) to expose either the PL11, Mini-UART or no serial device to the UART pins on the GPIO pin bar of the RPi. So far we've only half-heartedly dealt with that, with lost of heuristics that ended up falling apart at times. For example the RPi3 CM uses PL011 when serial is enabled in config.txt, but we disabled PL11 support for BCM2837 because the RPi3 uses the Mini-UART with enable_uart=1 is set in config.txt. This patch set always enables both serial outputs and determines at probe time whether a serial device is actually muxed to the UART pins on the board. Only in that case, it will be probed and thus used for in- and output in U-Boot. With this patch set applied, I have successfully used the same U-Boot binary with CONFIG_OF_BOARD=y and a RPi firmware provided device tree with both enable_uart=1 and without on both a RPi3 and RPi3 CM. This patch set depends on v3 of the patch set "Rpi: Add support for second sd host controller". v1 -> v2: - Make search logic easier to follow v2 -> v3: - Use bcm2835 specific serial devices to determine pinctrl state - New: Convert PL01* to Kconfig - New: Convert PL01* to dev_read - New: Convert BCM2835_MU to Kconfig - New: Add myself as maintainer - Use pinctrl driver to determine pinctrl state Alexander Graf (15): serial: Use next serial device if probing fails rpi: Remove runtime disabling support for serial serial: bcm283x_mu: Remove support for post-init disabling rpi: Determine PL011/Mini-UART availability at runtime serial_bcm283x_mu: Convert to dev_read serial_bcm283x_mu: Always skip init serial_bcm283x_mu: Fail loading if not muxed pl01x: Convert to dev_read pl010: Convert CONFIG_PL010_SERIAL to Kconfig pl011: Convert CONFIG_PL011_SERIAL to Kconfig pl01x: Convert CONFIG_PL01X_SERIAL to Kconfig bcm2835_mu_serial: Convert to Kconfig MAINTAINERS: Take over BCM2835 maintainership bcm2835_pl011_serial: Add BCM2835 specific serial driver bcm2835_pinctrl: Probe pre-reloc MAINTAINERS | 5 +- arch/arm/Kconfig | 31 ++++++++++++ arch/arm/dts/bcm283x-uboot.dtsi | 4 ++ board/raspberrypi/rpi/rpi.c | 43 ---------------- drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 3 +- drivers/serial/Kconfig | 34 +++++++++++++ drivers/serial/Makefile | 1 + drivers/serial/serial-uclass.c | 25 +++++++--- drivers/serial/serial_bcm283x_mu.c | 61 ++++++++++++++--------- drivers/serial/serial_bcm283x_pl011.c | 73 ++++++++++++++++++++++++++++ drivers/serial/serial_pl01x.c | 19 +++----- drivers/serial/serial_pl01x_internal.h | 15 +++++- include/configs/edb93xx.h | 1 - include/configs/highbank.h | 1 - include/configs/hikey.h | 3 -- include/configs/integrator-common.h | 2 - include/configs/mxs.h | 1 - include/configs/poplar.h | 3 -- include/configs/qemu-arm.h | 3 -- include/configs/rpi.h | 7 --- include/configs/spear-common.h | 1 - include/configs/stv0991.h | 3 -- include/configs/thunderx_88xx.h | 1 - include/configs/vexpress_aemv8a.h | 2 - include/configs/vexpress_common.h | 1 - include/configs/x600.h | 1 - include/dm/platform_data/serial_bcm283x_mu.h | 1 - scripts/config_whitelist.txt | 4 -- 28 files changed, 224 insertions(+), 125 deletions(-) create mode 100644 drivers/serial/serial_bcm283x_pl011.c -- 2.12.3

4 36

[U-Boot] [PATCH] arm: zynq: Enable debug uart on Zedboard
by Michal Simek 31 Jan '18

31 Jan '18

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> It helps with debugging. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/zynq_zed_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index a1403a34ef0f..ae57f7217e2f 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_ZYNQ=y CONFIG_SYS_TEXT_BASE=0x4000000 CONFIG_SPL_STACK_R_ADDR=0x200000 CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" +CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y @@ -46,6 +47,9 @@ CONFIG_PHY_MARVELL=y CONFIG_PHY_REALTEK=y CONFIG_PHY_XILINX=y CONFIG_ZYNQ_GEM=y +CONFIG_DEBUG_UART_ZYNQ=y +CONFIG_DEBUG_UART_BASE=0xe0001000 +CONFIG_DEBUG_UART_CLOCK=50000000 CONFIG_ZYNQ_SERIAL=y CONFIG_ZYNQ_QSPI=y CONFIG_USB=y -- 1.9.1

1 0

[U-Boot] [PATCH 2/2] i2c: imx: Take mx6dqp in consideration in the I2C_PADS_INFO macro
by Eran Matityahu 31 Jan '18

31 Jan '18

We should take the MX6DP and MX6QP options in consideration in the I2C_PADS_INFO macro. Based on a patch by Pierluigi Passaro <pierluigi.p(a)variscite.com> Signed-off-by: Eran Matityahu <eran.m(a)variscite.com> --- arch/arm/include/asm/mach-imx/mxc_i2c.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/mxc_i2c.h b/arch/arm/include/asm/mach-imx/mxc_i2c.h index 292bf0c..80018e4 100644 --- a/arch/arm/include/asm/mach-imx/mxc_i2c.h +++ b/arch/arm/include/asm/mach-imx/mxc_i2c.h @@ -88,8 +88,7 @@ struct mxc_i2c_bus { #define I2C_PADS_INFO(name) \ - (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) ? \ - &mx6q_##name : &mx6s_##name + (is_mx6dq() || is_mx6dqp()) ? &mx6q_##name : &mx6s_##name #endif int setup_i2c(unsigned i2c_index, int speed, int slave_addr, -- 1.9.1

2 1

[U-Boot] [PATCH 1/2] iomux-v3: Take mx6dqp in consideration for imx_iomux_v3_setup_pad()
by Eran Matityahu 31 Jan '18

31 Jan '18

We should take the MX6DP and MX6QP options in consideration when defining imx_iomux_v3_setup_pad(). Based on a patch by Pierluigi Passaro <pierluigi.p(a)variscite.com> Signed-off-by: Eran Matityahu <eran.m(a)variscite.com> --- arch/arm/include/asm/mach-imx/iomux-v3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index ed75e9c..2008dc9 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -240,7 +240,7 @@ void imx_iomux_gpio_get_function(unsigned int gpio, #if defined(CONFIG_MX6QDL) #define IOMUX_PADS(x) (MX6Q_##x), (MX6DL_##x) #define SETUP_IOMUX_PAD(def) \ -if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) { \ +if (is_mx6dq() || is_mx6dqp()) { \ imx_iomux_v3_setup_pad(MX6Q_##def); \ } else { \ imx_iomux_v3_setup_pad(MX6DL_##def); \ -- 1.9.1

2 1

[U-Boot] [PATCH] arm64: zynqmp: Enable ethernet driver for zc1751-dc5
by Michal Simek 31 Jan '18

31 Jan '18

Enable missing driver on this board. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig index 01a0ac0d762d..78d18bd4928f 100644 --- a/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig @@ -49,6 +49,8 @@ CONFIG_PHY_REALTEK=y CONFIG_PHY_TI=y CONFIG_PHY_VITESSE=y CONFIG_DM_ETH=y +CONFIG_PHY_GIGE=y +CONFIG_ZYNQ_GEM=y CONFIG_DEBUG_UART_ZYNQ=y CONFIG_DEBUG_UART_BASE=0xff000000 CONFIG_DEBUG_UART_CLOCK=100000000 -- 1.9.1

1 0

[U-Boot] [PATCH] Convert CONFIG_SYS_OMAP24_I2C_SLAVE et al to Kconfig
by Adam Ford 31 Jan '18

31 Jan '18

This converts the following to Kconfig: CONFIG_SYS_OMAP24_I2C_SLAVE CONFIG_SYS_OMAP24_I2C_SPEED Signed-off-by: Adam Ford <aford173(a)gmail.com> --- configs/am335x_baltos_defconfig | 1 + configs/cm_t3517_defconfig | 1 + configs/eco5pk_defconfig | 1 + configs/kc1_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/sniper_defconfig | 1 + configs/twister_defconfig | 1 + drivers/i2c/Kconfig | 14 ++++++++++++++ include/configs/am3517_crane.h | 2 -- include/configs/am3517_evm.h | 2 -- include/configs/baltos.h | 2 -- include/configs/bur_am335x_common.h | 2 -- include/configs/cm_t35.h | 2 -- include/configs/cm_t3517.h | 2 -- include/configs/kc1.h | 2 -- include/configs/mcx.h | 2 -- include/configs/nokia_rx51.h | 2 -- include/configs/siemens-am33x-common.h | 2 -- include/configs/sniper.h | 2 -- include/configs/tam3517-common.h | 2 -- include/configs/tao3530.h | 2 -- include/configs/ti_armv7_omap.h | 2 -- include/configs/tricorder.h | 2 -- scripts/config_whitelist.txt | 2 -- 24 files changed, 21 insertions(+), 32 deletions(-) diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 19ea684..a9d5f68 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -48,6 +48,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)" CONFIG_CMD_UBI=y CONFIG_ISO_PARTITION=y +CONFIG_SYS_OMAP24_I2C_SPEED=1000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SPL_NAND_DRIVERS=y diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index fa78bde..c1e1153 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),256k(u-boot-env),4m(kernel),-(fs)" CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_LED_STATUS=y CONFIG_LED_STATUS_GPIO=y CONFIG_LED_STATUS0=y diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index dac6aac..d0d82e9 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -27,6 +27,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader-nand),1024k(uboot-nand),256k(params-nand),5120k(kernel),-(ubifs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index eaf7112..b501dfe 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -35,6 +35,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index fc184d7..e5df51d 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -32,6 +32,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),8m(ubisystem),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 0761698..d06dfd6 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -36,6 +36,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index 34bd769..846e8c9 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -32,6 +32,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 0630712..17d21bb 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -162,6 +162,20 @@ config SYS_I2C_OMAP24XX help Add support for the OMAP2+ I2C driver. +if SYS_I2C_OMAP24XX +config SYS_OMAP24_I2C_SLAVE + int "I2C Slave addr channel 0" + default 1 + help + OMAP24xx I2C Slave address channel 0 + +config SYS_OMAP24_I2C_SPEED + int "I2C Slave channel 0 speed" + default 100000 + help + OMAP24xx Slave speed channel 0 +endif + config SYS_I2C_RCAR_IIC bool "Renesas RCar Gen3 IIC driver" depends on RCAR_GEN3 && DM_I2C diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 852bc4d..c97d4a5 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -97,8 +97,6 @@ #endif /* CONFIG_USB_AM35X */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * Board NAND Info. diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 91e7a55..440ccb4 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -56,8 +56,6 @@ #endif /* CONFIG_USB_MUSB_AM35X */ /* I2C */ -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* Ethernet */ #define CONFIG_DRIVER_TI_EMAC diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 939ee3b..75dd0c5 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -39,8 +39,6 @@ #define CONFIG_MTD_DEVICE /* I2C configuration */ -#undef CONFIG_SYS_OMAP24_I2C_SPEED -#define CONFIG_SYS_OMAP24_I2C_SPEED 1000 #ifdef CONFIG_NAND #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x00080000 diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 919d74a..72e2cce 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -70,8 +70,6 @@ /* I2C */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * Our platforms make use of SPL to initalize the hardware (primarily diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 7e3d607..c549d46 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -80,8 +80,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_BUS 0 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 48dd6a6..ea5edd9 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -89,8 +89,6 @@ #define CONFIG_MTD_PARTITIONS #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_I2C_EEPROM_BUS 0 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 9db99e7..60822bc 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -58,8 +58,6 @@ */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_I2C_MULTI_BUS /* diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 3459ca1..736ce68 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -79,8 +79,6 @@ #define CONFIG_MTD_DEVICE #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* RTC */ #define CONFIG_RTC_DS1337 diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 00509e8..6312ed7 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -95,8 +95,6 @@ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * TWL4030 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 32ba972..1a3b87f 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -97,8 +97,6 @@ /* I2C Configuration */ #define CONFIG_I2C #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* Defines for SPL */ #define CONFIG_SPL_TEXT_BASE 0x402F0400 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index b66aeac..e7b251c 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -59,8 +59,6 @@ */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_I2C_MULTI_BUS /* diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 71b0034..9d79885 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -67,8 +67,6 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 400000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* base address */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */ #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW 0x07 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index bb66526..07bfa0f 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -63,8 +63,6 @@ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 #define CONFIG_I2C_MULTI_BUS /* diff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h index 2cff868..0e960a7 100644 --- a/include/configs/ti_armv7_omap.h +++ b/include/configs/ti_armv7_omap.h @@ -13,8 +13,6 @@ #define __CONFIG_TI_ARMV7_OMAP_H__ /* I2C IP block */ -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* * GPMC NAND block. We support 1 device and the physical address to diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index b6cf498..652fdc4 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -58,8 +58,6 @@ /* I2C */ #define CONFIG_SYS_I2C -#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 -#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 /* EEPROM */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2f7cd2e..57a625c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3897,12 +3897,10 @@ CONFIG_SYS_NVRAM_SIZE CONFIG_SYS_OBIR CONFIG_SYS_OHCI_BE_CONTROLLER CONFIG_SYS_OHCI_SWAP_REG_ACCESS -CONFIG_SYS_OMAP24_I2C_SLAVE CONFIG_SYS_OMAP24_I2C_SLAVE1 CONFIG_SYS_OMAP24_I2C_SLAVE2 CONFIG_SYS_OMAP24_I2C_SLAVE3 CONFIG_SYS_OMAP24_I2C_SLAVE4 -CONFIG_SYS_OMAP24_I2C_SPEED CONFIG_SYS_OMAP24_I2C_SPEED1 CONFIG_SYS_OMAP24_I2C_SPEED2 CONFIG_SYS_OMAP24_I2C_SPEED3 -- 2.7.4

3 2