January 2018 - U-Boot

[U-Boot] [PATCH 0/6] am335x-fb: support display PLL for lcd-clock / pixel-clock
by Hannes Schmelzer 09 Jan '18

09 Jan '18

In most cases days ago the LCDC IP-core clock on AM335x was sourced from the peripheral PLL with 192 MHz and the pixel clock for the connected lcd-screen was made more or less accurate with a divider inside LCDC IP- core. For certain displays, example a standard VGA with 25.17 MHz pixelclock, it is almost impossible to generate a reasonably clock with the 192 MHz base and a simple divider. For those cases we have to use the dedicated DPLL_DISP generating a dividable clock-source for the LCDC. This series does this with following steps: - adding register definition of the display PLL to clock_am33xx - calculate mult, dividers with lowest error and setup the display PLL, selecting as clock-source for LCDC the display PLL. - drop the hardcoded dependency in BuR/common to the 192 MHz and provide a real clock-frequency instead a divider - drop the clock selection for the LCDC within board code - do minor cosmetic cleanups (updating copyright, coding style) Hannes Schmelzer (6): mach-omap2: add AM335x Display PLL register definition am335x-fb: cosmetic: update-copyright am335x-fb: cosmetic: fix coding style am335x-fb: setup display PLL board/BuR: provide real clock-frequency instead a divider board/BuR: drop LCDC clock manipulation from board code arch/arm/include/asm/arch-am33xx/clock.h | 1 + arch/arm/mach-omap2/am33xx/clock_am33xx.c | 7 ++++ board/BuR/brppt1/board.c | 3 -- board/BuR/brxre1/board.c | 2 - board/BuR/common/common.c | 14 ++----- drivers/video/am335x-fb.c | 64 +++++++++++++++++++++++++++---- drivers/video/am335x-fb.h | 6 +-- 7 files changed, 71 insertions(+), 26 deletions(-) -- 2.7.4

3 12

[U-Boot] [PATCH 01/05] env: enable accessing the environment in an EXT4 partition
by Jorge Ramirez-Ortiz 09 Jan '18

09 Jan '18

For example to store the environment in a file named "/uboot.env" in MMC "0", where partition "1" contains the EXT4 filesystem, the following configs should be added to the board's default config: CONFIG_ENV_IS_IN_EXT4=y CONFIG_ENV_EXT4_DEVICE_AND_PART="0:1" CONFIG_ENV_EXT4_FILE="/uboot.env" CONFIG_ENV_EXT4_INTERFACE="mmc" Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz(a)linaro.org> --- env/Kconfig | 39 +++++++++++++++++++++++++++++++++++++++ env/env.c | 2 ++ env/ext4.c | 20 ++++++++++---------- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/env/Kconfig b/env/Kconfig index bef6e89..692f863 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -81,6 +81,13 @@ config ENV_IS_IN_FAT - CONFIG_FAT_WRITE: This must be enabled. Otherwise it cannot save the environment file. +config ENV_IS_IN_EXT4 + bool "Environment is in a EXT4 filesystem" + depends on !CHAIN_OF_TRUST + select EXT4_WRITE + help + Define this if you want to use the EXT4 file system for the environment. + config ENV_IS_IN_FLASH bool "Environment in flash memory" depends on !CHAIN_OF_TRUST @@ -396,6 +403,38 @@ config ENV_FAT_FILE It's a string of the FAT file name. This file use to store the environment. +config ENV_EXT4_INTERFACE + string "Name of the block device for the environment" + depends on ENV_IS_IN_EXT4 + help + Define this to a string that is the name of the block device. + +config ENV_EXT4_DEVICE_AND_PART + string "Device and partition for where to store the environemt in EXT4" + depends on ENV_IS_IN_EXT4 + help + Define this to a string to specify the partition of the device. It can + be as following: + + "D:P", "D:0", "D", "D:" or "D:auto" (D, P are integers. And P >= 1) + - "D:P": device D partition P. Error occurs if device D has no + partition table. + - "D:0": device D. + - "D" or "D:": device D partition 1 if device D has partition + table, or the whole device D if has no partition + table. + - "D:auto": first partition in device D with bootable flag set. + If none, first valid partition in device D. If no + partition table then means device D. + +config ENV_EXT4_FILE + string "Name of the EXT4 file to use for the environemnt" + depends on ENV_IS_IN_EXT4 + default "uboot.env" + help + It's a string of the EXT4 file name. This file use to store the + environment (explicit path to the file) + if ARCH_SUNXI config ENV_OFFSET diff --git a/env/env.c b/env/env.c index 76a5608..7455632 100644 --- a/env/env.c +++ b/env/env.c @@ -32,6 +32,8 @@ static enum env_location env_get_default_location(void) return ENVL_EEPROM; else if IS_ENABLED(CONFIG_ENV_IS_IN_FAT) return ENVL_FAT; + else if IS_ENABLED(CONFIG_ENV_IS_IN_EXT4) + return ENVL_EXT4; else if IS_ENABLED(CONFIG_ENV_IS_IN_FLASH) return ENVL_FLASH; else if IS_ENABLED(CONFIG_ENV_IS_IN_MMC) diff --git a/env/ext4.c b/env/ext4.c index 6520221..07fd061 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -46,8 +46,8 @@ static int env_ext4_save(void) if (err) return err; - part = blk_get_device_part_str(EXT4_ENV_INTERFACE, - EXT4_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE, + CONFIG_ENV_EXT4_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) return 1; @@ -57,16 +57,16 @@ static int env_ext4_save(void) if (!ext4fs_mount(info.size)) { printf("\n** Unable to use %s %s for saveenv **\n", - EXT4_ENV_INTERFACE, EXT4_ENV_DEVICE_AND_PART); + CONFIG_ENV_EXT4_INTERFACE, CONFIG_ENV_EXT4_DEVICE_AND_PART); return 1; } - err = ext4fs_write(EXT4_ENV_FILE, (void *)&env_new, sizeof(env_t)); + err = ext4fs_write(CONFIG_ENV_EXT4_FILE, (void *)&env_new, sizeof(env_t)); ext4fs_close(); if (err == -1) { printf("\n** Unable to write \"%s\" from %s%d:%d **\n", - EXT4_ENV_FILE, EXT4_ENV_INTERFACE, dev, part); + CONFIG_ENV_EXT4_FILE, CONFIG_ENV_EXT4_INTERFACE, dev, part); return 1; } @@ -84,8 +84,8 @@ static int env_ext4_load(void) int err; loff_t off; - part = blk_get_device_part_str(EXT4_ENV_INTERFACE, - EXT4_ENV_DEVICE_AND_PART, + part = blk_get_device_part_str(CONFIG_ENV_EXT4_INTERFACE, + CONFIG_ENV_EXT4_DEVICE_AND_PART, &dev_desc, &info, 1); if (part < 0) goto err_env_relocate; @@ -95,16 +95,16 @@ static int env_ext4_load(void) if (!ext4fs_mount(info.size)) { printf("\n** Unable to use %s %s for loading the env **\n", - EXT4_ENV_INTERFACE, EXT4_ENV_DEVICE_AND_PART); + CONFIG_ENV_EXT4_INTERFACE, CONFIG_ENV_EXT4_DEVICE_AND_PART); goto err_env_relocate; } - err = ext4_read_file(EXT4_ENV_FILE, buf, 0, CONFIG_ENV_SIZE, &off); + err = ext4_read_file(CONFIG_ENV_EXT4_FILE, buf, 0, CONFIG_ENV_SIZE, &off); ext4fs_close(); if (err == -1) { printf("\n** Unable to read \"%s\" from %s%d:%d **\n", - EXT4_ENV_FILE, EXT4_ENV_INTERFACE, dev, part); + CONFIG_ENV_EXT4_FILE, CONFIG_ENV_EXT4_INTERFACE, dev, part); goto err_env_relocate; } -- 2.7.4

3 7

[U-Boot] [U-boot] Odroidxu3/4 -s2mps11 bind pmic failed
by Anand Moon 09 Jan '18

09 Jan '18

Hi All, I would like to get the s2mps11 regulator binding for u-boot to work on Odroid XU3/XU4 as in case of Odroid U3 we have max77686_bind function which dose the job. what will be the correct way to reset s2mps11 control register to the default values in-order to support reset of some regulators. Below is the command I tried to gather some information but it failed. Best Regards -Anand Moon ----------------------------------------------------------------------------------------------------------------------------------------- U-Boot 2018.01-rc3-00060-g1314bd1 (Jan 02 2018 - 17:56:26 +0000) for ODROID-XU3/XU4/HC1 CPU: Exynos5422 @ 800 MHz Model: Odroid XU3 based on EXYNOS5422 Board: Odroid XU3 based on EXYNOS5422 Type: xu4 DRAM: 2 GiB MMC: EXYNOS DWMMC: 0, EXYNOS DWMMC: 1 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Net: No ethernet found. Hit any key to stop autoboot: 0 Card did not respond to voltage select! mmc_init: -95, time 11 switch to partitions #0, OK mmc0 is current device Scanning mmc 0:1... reading /exynos5422-odroidxu4.dtb 62815 bytes read in 9 ms (6.7 MiB/s) starting USB... USB0: USB EHCI 1.00 USB1: Register 2000140 NbrPorts 2 Starting the controller USB XHCI 1.00 USB2: Register 2000140 NbrPorts 2 Starting the controller USB XHCI 1.00 scanning bus 0 for devices... 1 USB Device(s) found scanning bus 1 for devices... 3 USB Device(s) found scanning bus 2 for devices... 2 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found scanning usb for ethernet devices... 1 Ethernet Device(s) found Waiting for Ethernet connection... done. BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 10.0.0.144 (1200 ms) *** Warning: no boot file name; using '0A000090.img' Using r8152#0 device TFTP from server 0.0.0.0; our IP address is 10.0.0.144; sending through gateway 10.0.0.1 Filename '0A000090.img'. Load address: 0x43e00000 Loading: * TFTP error: 'File not found' (1) Not retrying... missing environment variable: pxeuuid missing environment variable: bootfile Retrieving file: pxelinux.cfg/0A000090 *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/0A00009 *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/0A0000 *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/0A000 *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/0A00 *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/0A0 *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/0A *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/0 *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/default-arm-exynos *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/default-arm *** ERROR: `serverip' not set missing environment variable: bootfile Retrieving file: pxelinux.cfg/default *** ERROR: `serverip' not set Config file not found BOOTP broadcast 1 DHCP client bound to address 10.0.0.144 (644 ms) Using r8152#0 device TFTP from server 0.0.0.0; our IP address is 10.0.0.144; sending through gateway 10.0.0.1 Filename 'boot.scr.uimg'. Load address: 0x50000000 Loading: * TFTP error: 'File not found' (1) Not retrying... BOOTP broadcast 1 BOOTP broadcast 2 DHCP client bound to address 10.0.0.144 (1257 ms) Using r8152#0 device TFTP from server 0.0.0.0; our IP address is 10.0.0.144; sending through gateway 10.0.0.1 Filename 'boot.scr.uimg'. Load address: 0x42000000 Loading: * TFTP error: 'File not found' (1) Not retrying... ODROID-XU3 # ODROID-XU3 # ODROID-XU3 # pmic s2mps11 dump pmic - operations Usage: pmic list - list pmic devices pmic dev [name] - show or [set] operating PMIC device pmic dump - dump registers pmic read address - read byte of register at address pmic write address - write byte to register at address ODROID-XU3 # pmic list | Name | Parent name | Parent uclass @ seq | s2mps11_pmic@66 | i2c@12CA0000 | i2c @ 4 ODROID-XU3 # pmic s2mps11_pmic dump pmic - operations Usage: pmic list - list pmic devices pmic dev [name] - show or [set] operating PMIC device pmic dump - dump registers pmic read address - read byte of register at address pmic write address - write byte to register at address ODROID-XU3 # pmic dump First, set the PMIC device! pmic - operations Usage: pmic list - list pmic devices pmic dev [name] - show or [set] operating PMIC device pmic dump - dump registers pmic read address - read byte of register at address pmic write address - write byte to register at address ODROID-XU3 # pmic s2mps11_pmic pmic - operations Usage: pmic list - list pmic devices pmic dev [name] - show or [set] operating PMIC device pmic dump - dump registers pmic read address - read byte of register at address pmic write address - write byte to register at address ODROID-XU3 # pmic read First, set the PMIC device! pmic - operations Usage: pmic list - list pmic devices pmic dev [name] - show or [set] operating PMIC device pmic dump - dump registers pmic read address - read byte of register at address pmic write address - write byte to register at address ODROID-XU3 # pmic read 12CA0000 First, set the PMIC device! pmic - operations Usage: pmic list - list pmic devices pmic dev [name] - show or [set] operating PMIC device pmic dump - dump registers pmic read address - read byte of register at address pmic write address - write byte to register at address ODROID-XU3 #

3 10

[U-Boot] [PATCH] ARM: zynq: remove unused CONFIG_ZC770_XM01* options
by Masahiro Yamada 09 Jan '18

09 Jan '18

These are defined, but not referenced at all. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- configs/zynq_zc770_xm010_defconfig | 1 - configs/zynq_zc770_xm011_defconfig | 1 - configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 1 - 4 files changed, 4 deletions(-) diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index dbca4a6..69042f8 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -5,7 +5,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index b1511d8..e78f4a2 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 71b379a..956f1a4 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index 4ffb2f9..fc26bd0 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -6,7 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_OS_BOOT=y -- 2.7.4

2 1

[U-Boot] [PATCH] arm: zynq: Remove ZC770_ config option
by Michal Simek 09 Jan '18

09 Jan '18

This option is obsolete and it is no longer valid. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/zynq_zc770_xm010_defconfig | 1 - configs/zynq_zc770_xm011_defconfig | 1 - configs/zynq_zc770_xm012_defconfig | 1 - configs/zynq_zc770_xm013_defconfig | 1 - scripts/config_whitelist.txt | 4 ---- 5 files changed, 8 deletions(-) diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index 897ca91e5606..2b8fb3c9214a 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -7,7 +7,6 @@ CONFIG_DEBUG_UART=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index 2b8a12ee6906..52ad66a38f61 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM011" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index d53fe94db36b..a8338f5c2d82 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index e6445f735c57..01e2cfe04fb2 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL=y CONFIG_SPL_STACK_R=y diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43a4ff08928d..c1f1a0085768 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5058,10 +5058,6 @@ CONFIG_YAFFS_UNICODE CONFIG_YAFFS_UTIL CONFIG_YAFFS_WINCE CONFIG_YELLOW_LED -CONFIG_ZC770_XM010 -CONFIG_ZC770_XM011 -CONFIG_ZC770_XM012 -CONFIG_ZC770_XM013 CONFIG_ZLIB CONFIG_ZLT CONFIG_ZM7300 -- 1.9.1

2 2

Re: [U-Boot] [PATCH 0/3] cadence-quadspi: Fix issues with non 32bit aligned accesses
by Goldschmidt Simon 09 Jan '18

09 Jan '18

On 08/01/2018 12:18m Vignesh R wrote: > This series reverts use of bounce_buf.c for non-DMA related alignment restriction > and replaces it with local bounce buffer to handle problems with non 32 bit aligned > writes on TI platforms. > Based on top of Jason's series: > https://patchwork.ozlabs.org/cover/856431/ > > Tested on K2G EVM. > > Goldschmidt Simon (1): > Revert "spi: cadence_qspi_apb: Use 32 bit indirect read transaction > when possible" > > Vignesh R (2): > Revert "spi: cadence_qspi_apb: Use 32 bit indirect write transaction > when possible" > spi: cadence_qspi_apb: Make flash writes 32 bit aligned > > drivers/spi/cadence_qspi.c | 13 ++++++++++++- > drivers/spi/cadence_qspi.h | 1 + > drivers/spi/cadence_qspi_apb.c | 42 +++++++++------------------------------- > include/configs/k2g_evm.h | 1 - > include/configs/socfpga_common.h | 1 - > include/configs/stv0991.h | 1 - > 6 files changed, 22 insertions(+), 37 deletions(-) For this whole series: Tested on a socfpga-cyclonev board (with a Micron N25QL256A): Tested-by: Simon Goldschmidt <sgoldschmidt(a)de.pepperl-fuchs.com> After applying this series on top of Jason's v5, qspi on the socfpga is finally working without local fixes! Regards, Simon

1 0

[U-Boot] u-boot/next and HS MMC patches
by Tom Rini 09 Jan '18

09 Jan '18

Hey everyone, I pulled the previous MMC PR into u-boot/next, so that we wouldn't have the current round of MMC improvements get lost. Since then, there's been at least one update to the series to improve the binary size growth, and Masahiro has posted a round of fixes as well. Can I please get a PR this week, against master, with everything relevant in it, so that we can move forward on additional improvements here? Otherwise I'll take a look at what I need to do with what's in next currently. Thanks! -- Tom

2 1

[U-Boot] [PATCH v1 1/2] x86: tangier: Use actual GPIO hardware numbers
by Andy Shevchenko 09 Jan '18

09 Jan '18

The recent commit 03c4749dd6c7 ("gpio / ACPI: Drop unnecessary ACPI GPIO to Linux GPIO translation") in the Linux kernel reveals the issue we have in ACPI tables here, i.e. we must use hardware numbers for GPIO resources and, taking into consideration that GPIO and pin control are *different* IPs on Intel Tangier, we need to supply numbers properly. Besides that, it improves user experience since the official documentation for Intel Edison board is referring to GPIO hardware numbering scheme. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- Bin, this is kinda urgent fix. I wouldn't like to have a release with wrong numbering scheme, although there is none users yet, only couple amateurs that are experimenting with the code. arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index 288b57cb80..8162df59b5 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl @@ -173,13 +173,13 @@ Device (PCI0) Name (RBUF, ResourceTemplate() { GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly, - "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 91 } + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 110 } GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly, - "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 92 } + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 111 } GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly, - "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 93 } + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 112 } GpioIo(Exclusive, PullUp, 0, 0, IoRestrictionOutputOnly, - "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 94 } + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 113 } }) Method (_CRS, 0, NotSerialized) @@ -245,7 +245,7 @@ Device (PCI0) { Connection ( GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionOutputOnly, - "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 56 } + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 96 } ), WFD3, 1, } -- 2.15.1

3 7

[U-Boot] [PATCH v2] x86: Move commands from under arch/x86 to cmd/x86/
by Tom Rini 09 Jan '18

09 Jan '18

We only need to compile and link these files when building for full U-Boot. Move them to under cmd/x86/ to make sure they aren't linked in and undiscarded due to u_boot_list_2_cmd_* being included). Cc: Bin Meng <bmeng.cn(a)gmail.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v2: - Format patch with -M - Drop 'cmd_' from the new file name (and checked file content for now erroneous cmd in comments, none found). arch/x86/lib/Makefile | 1 - arch/x86/lib/fsp/Makefile | 1 - cmd/Makefile | 2 ++ cmd/x86/Makefile | 6 ++++++ arch/x86/lib/fsp/cmd_fsp.c => cmd/x86/fsp.c | 0 arch/x86/lib/cmd_mtrr.c => cmd/x86/mtrr.c | 0 6 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 cmd/x86/Makefile rename arch/x86/lib/fsp/cmd_fsp.c => cmd/x86/fsp.c (100%) rename arch/x86/lib/cmd_mtrr.c => cmd/x86/mtrr.c (100%) diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 7d729ea0f7dc..f6be13fe9492 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -23,7 +23,6 @@ obj-y += interrupts.o obj-y += lpc-uclass.o obj-y += mpspec.o obj-$(CONFIG_ENABLE_MRC_CACHE) += mrccache.o -obj-y += cmd_mtrr.o obj-y += northbridge-uclass.o obj-$(CONFIG_I8259_PIC) += i8259.o obj-$(CONFIG_I8254_TIMER) += i8254.o diff --git a/arch/x86/lib/fsp/Makefile b/arch/x86/lib/fsp/Makefile index afe83dd32437..c7a248f7f2e7 100644 --- a/arch/x86/lib/fsp/Makefile +++ b/arch/x86/lib/fsp/Makefile @@ -4,7 +4,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += cmd_fsp.o obj-y += fsp_car.o obj-y += fsp_common.o obj-y += fsp_dram.o diff --git a/cmd/Makefile b/cmd/Makefile index 00e38696daaf..ab45bf434a96 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -150,6 +150,8 @@ obj-$(CONFIG_CMD_PMIC) += pmic.o obj-$(CONFIG_CMD_REGULATOR) += regulator.o obj-$(CONFIG_CMD_BLOB) += blob.o + +obj-$(CONFIG_X86) += x86/ endif # !CONFIG_SPL_BUILD # core command diff --git a/cmd/x86/Makefile b/cmd/x86/Makefile new file mode 100644 index 000000000000..d4c690b0551d --- /dev/null +++ b/cmd/x86/Makefile @@ -0,0 +1,6 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += mtrr.o +obj-$(CONFIG_HAVE_FSP) += fsp.o diff --git a/arch/x86/lib/fsp/cmd_fsp.c b/cmd/x86/fsp.c similarity index 100% rename from arch/x86/lib/fsp/cmd_fsp.c rename to cmd/x86/fsp.c diff --git a/arch/x86/lib/cmd_mtrr.c b/cmd/x86/mtrr.c similarity index 100% rename from arch/x86/lib/cmd_mtrr.c rename to cmd/x86/mtrr.c -- 2.7.4

2 2

[U-Boot] [PATCH 1/1] configs: x86: allow to override CONFIG_BOOTCOMMAND
by Heinrich Schuchardt 09 Jan '18

09 Jan '18

Allow to override CONFIG_BOOTCOMMAND in .config. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/configs/x86-common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 064c546403..3d536dc9d5 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -64,8 +64,10 @@ * Command line configuration. */ +#ifndef CONFIG_BOOTCOMMAND #define CONFIG_BOOTCOMMAND \ "ext2load scsi 0:3 01000000 /boot/vmlinuz; zboot 01000000" +#endif #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 115200 -- 2.14.2

3 5