November 2018 - U-Boot

[U-Boot] [PATCH v2] arm64: mvebu: fix crash in EFI memory allocation
by Baruch Siach 22 Nov '18

22 Nov '18

EFI memory allocation code return values that are not mapped by U-Boot MMU. This causes a crash when tftp calls efi_set_bootdev(). Fix this similarly to commit 0797f7f0b7e1 ("ARM: tegra: reserve unmapped RAM so EFI doesn't use it"). Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- v2: Fix the CONFIG_NR_DRAM_BANKS=1 case --- arch/arm/mach-mvebu/arm64-common.c | 13 ++----------- arch/arm/mach-mvebu/include/mach/cpu.h | 9 +++++++++ board/Marvell/mvebu_armada-8k/board.c | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 47bbf69944ec..b82f33093a2c 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -17,19 +17,10 @@ DECLARE_GLOBAL_DATA_PTR; -/* - * Not all memory is mapped in the MMU. So we need to restrict the - * memory size so that U-Boot does not try to access it. Also, the - * internal registers are located at 0xf000.0000 - 0xffff.ffff. - * Currently only 2GiB are mapped for system memory. This is what - * we pass to the U-Boot subsystem here. - */ -#define USABLE_RAM_SIZE 0x80000000 - ulong board_get_usable_ram_top(ulong total_size) { - if (gd->ram_size > USABLE_RAM_SIZE) - return USABLE_RAM_SIZE; + if (gd->ram_size > MVEBU_ARM64_USABLE_RAM_SIZE) + return MVEBU_ARM64_USABLE_RAM_SIZE; return gd->ram_size; } diff --git a/arch/arm/mach-mvebu/include/mach/cpu.h b/arch/arm/mach-mvebu/include/mach/cpu.h index 85d7dd1610a8..e22a14977859 100644 --- a/arch/arm/mach-mvebu/include/mach/cpu.h +++ b/arch/arm/mach-mvebu/include/mach/cpu.h @@ -177,5 +177,14 @@ int mvebu_lcd_register_init(struct mvebu_lcd_info *lcd_info); */ u32 get_ref_clk(void); +/* + * Not all memory is mapped in the MMU. So we need to restrict the + * memory size so that U-Boot does not try to access it. Also, the + * internal registers are located at 0xf000.0000 - 0xffff.ffff. + * Currently only 2GiB are mapped for system memory. This is what + * we pass to the U-Boot subsystem in board_get_usable_ram_top(). + */ +#define MVEBU_ARM64_USABLE_RAM_SIZE 0x80000000 + #endif /* __ASSEMBLY__ */ #endif /* _MVEBU_CPU_H */ diff --git a/board/Marvell/mvebu_armada-8k/board.c b/board/Marvell/mvebu_armada-8k/board.c index e927e338ea6e..86f9d8a4a424 100644 --- a/board/Marvell/mvebu_armada-8k/board.c +++ b/board/Marvell/mvebu_armada-8k/board.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <i2c.h> +#include <efi_loader.h> #include <asm/io.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> @@ -154,6 +155,22 @@ int board_init(void) int board_late_init(void) { + uint64_t unmapped_ram_start = gd->bd->bi_dram[0].start + + MVEBU_ARM64_USABLE_RAM_SIZE; + uint64_t unmapped_ram_size = gd->bd->bi_dram[0].size + - MVEBU_ARM64_USABLE_RAM_SIZE; + +#if CONFIG_IS_ENABLED(EFI_LOADER) + if (gd->bd->bi_dram[0].size > MVEBU_ARM64_USABLE_RAM_SIZE) + efi_add_memory_map(unmapped_ram_start, + unmapped_ram_size >> EFI_PAGE_SHIFT, + EFI_BOOT_SERVICES_DATA, false); + if (CONFIG_NR_DRAM_BANKS > 1 && gd->bd->bi_dram[1].start) + efi_add_memory_map(gd->bd->bi_dram[1].start, + gd->bd->bi_dram[1].size >> EFI_PAGE_SHIFT, + EFI_BOOT_SERVICES_DATA, false); +#endif + /* Pre-configure the USB ports (overcurrent, VBus) */ board_xhci_config(); -- 2.19.1

1 0

[U-Boot] [PATCH] microblaze: Showing model information from DT by default
by Michal Simek 22 Nov '18

22 Nov '18

Show information about board read from DT by default to know what board U-Boot is running at. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- configs/microblaze-generic_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 0b21020cfffa..02e62e2ee8d5 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -16,6 +16,7 @@ CONFIG_BOOTDELAY=-1 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="root=romfs" CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_DISPLAY_BOARDINFO=y CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y -- 1.9.1

1 0

[U-Boot] [PATCH] microblaze: Use standard functions for memory decoding
by Michal Simek 22 Nov '18

22 Nov '18

The standard function is less error prone than custom one. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- .../xilinx/microblaze-generic/microblaze-generic.c | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index 44fb48b347a5..c946ec320855 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -32,34 +32,13 @@ ulong ram_base; int dram_init_banksize(void) { - gd->bd->bi_dram[0].start = ram_base; - gd->bd->bi_dram[0].size = get_effective_memsize(); - - return 0; + return fdtdec_setup_memory_banksize(); } int dram_init(void) { - int node; - fdt_addr_t addr; - fdt_size_t size; - const void *blob = gd->fdt_blob; - - node = fdt_node_offset_by_prop_value(blob, -1, "device_type", - "memory", 7); - if (node == -FDT_ERR_NOTFOUND) { - debug("DRAM: Can't get memory node\n"); - return 1; - } - addr = fdtdec_get_addr_size(blob, node, "reg", &size); - if (addr == FDT_ADDR_T_NONE || size == 0) { - debug("DRAM: Can't get base address or size\n"); - return 1; - } - ram_base = addr; - - gd->ram_top = addr; /* In setup_dest_addr() is done +ram_size */ - gd->ram_size = size; + if (fdtdec_setup_mem_size_base() != 0) + return -EINVAL; return 0; }; -- 1.9.1

1 0

[U-Boot] [PATCH v4 00/28] General fixes / cleanup for RISC-V and improvements to qemu-riscv
by Lukas Auer 22 Nov '18

22 Nov '18

This patch series includes general fixes and cleanup for RISC-V. It also adds support for booting Linux on qemu-riscv. At the moment, only single-core systems are supported. Support for multi-core systems will be added with a future patch series. To boot Linux on qemu-riscv, Linux must be compiled into BBL as a payload. BBL must be included in a FIT image and supplied to QEMU with the -kernel parameter. Its location in memory is embedded in the device tree, which QEMU passes to u-boot. To test this, QEMU and riscv-pk (BBL) must be modified. QEMU is modified to add support for loading binary files (FIT images in this case) in addition to ELF files. riscv-pk must be modified to adjust the link address. A pull request for QEMU, which implements this, is available at [1]. A modified version of riscv-pk is available at [2]. [1]: https://github.com/riscv/riscv-qemu/pull/175 [2]: https://github.com/lukasauer/riscv-pk/tree/riscv-u-boot Changes in v4: - Rebase on u-boot/master Changes in v3: - New patch to add VirtIO distro boot command - New patch to enable distro boot on qemu-riscv32/64 - Adapt code and commit message to distro boot - Replace printf with debug - Clarify debug messages if no chosen node is found Changes in v2: - Replace the description of RISCV_ISA_C with that of the Linux kernel, as suggested by Bin Meng - Change ISA string construction, as suggested by Bin Meng - Remove 0-padding in the format string to avoid printing 16 digits on RV32I systems - New patch to replace patch "riscv: remove CONFIG_INIT_CRITICAL" - Drop removal of code that stores the contents of a2; this broke the board ax25-ae350. The code will be removed again in a future patch. - Rebase onto u-boot-dm/next - Rebase onto u-boot-dm/next - Move prototype location to match the location of the function in ofnode.c - Rebase onto u-boot-dm/next - Boot Linux with the device tree provided by the prior boot stage - New patch Bin Meng (1): Drop CONFIG_INIT_CRITICAL Lukas Auer (27): tools: .gitignore: add prelink-riscv dts: riscv: update makefile to also clean the RISC-V dts directory riscv: rename CPU_RISCV_32/64 to match architecture names ARCH_RV32I/64I riscv: select CONFIG_PHYS_64BIT on RV64I systems riscv: add Kconfig entries for the C and A ISA extensions riscv: set -march and -mabi based on the Kconfig configuration riscv: enable -fdata-sections riscv: fix use of incorrectly sized variables riscv: make use of the barrier functions from Linux riscv: do not reimplement generic io functions riscv: complete the list of exception codes riscv: treat undefined exception codes as reserved riscv: hang on unhandled exceptions riscv: implement the invalidate_icache_* functions riscv: fix inconsistent use of spaces and tabs in start.S riscv: align mtvec on a 4-byte boundary riscv: remove unused labels in start.S riscv: do not blindly modify the mstatus CSR riscv: save hart ID and device tree passed by prior boot stage riscv: qemu: use device tree passed by prior boot stage riscv: qemu: support booting Linux riscv: align bootm implementation with that of other architectures distro_bootcmd: add VirtIO distro boot command riscv: qemu: enable distro boot dm: core: add missing prototype for ofnode_read_u64 riscv: qemu: detect and boot the kernel passed by QEMU riscv: qemu: clear kernel-start/-end in device tree as workaround for BBL arch/nds32/cpu/n1213/start.S | 51 ---- arch/riscv/Kconfig | 28 +- arch/riscv/Makefile | 20 ++ arch/riscv/config.mk | 7 +- arch/riscv/cpu/cpu.c | 6 + arch/riscv/cpu/start.S | 342 ++++++++++++------------ arch/riscv/include/asm/barrier.h | 67 +++++ arch/riscv/include/asm/io.h | 48 +--- arch/riscv/include/asm/posix_types.h | 6 +- arch/riscv/include/asm/types.h | 4 + arch/riscv/lib/bootm.c | 97 +++++-- arch/riscv/lib/cache.c | 10 + arch/riscv/lib/interrupts.c | 31 ++- arch/riscv/lib/setjmp.S | 2 +- board/armltd/integrator/README | 4 +- board/emulation/qemu-riscv/Kconfig | 2 + board/emulation/qemu-riscv/qemu-riscv.c | 73 ++++- configs/ax25-ae350_defconfig | 2 +- configs/qemu-riscv32_defconfig | 5 +- configs/qemu-riscv64_defconfig | 7 +- doc/README.distro | 3 +- dts/Makefile | 2 +- include/common.h | 5 - include/config_distro_bootcmd.h | 21 +- include/configs/qemu-riscv.h | 28 ++ include/dm/ofnode.h | 10 + scripts/config_whitelist.txt | 1 - tools/.gitignore | 1 + 28 files changed, 538 insertions(+), 345 deletions(-) create mode 100644 arch/riscv/include/asm/barrier.h -- 2.17.2

1 28

Re: [U-Boot] Uboot send pull request
by Rick Chen 22 Nov '18

22 Nov '18

Hi Lukas > > > > Hi Rick, > > > > Thanks for pulling my changes! I have some notes and questions on it. > > > > I can't find all of your patches on the mailing list, for example the patch "configs: > > ax25-ae350: Enable DISPLAY_CPUINFO & DISPLAY_BOARDINFO". Others include > > changes, which have not been submitted to the mailing list. Please send all > > changes to the mailing list before including them in a pull request. This is really > > helpful for me and others, to be able to see if there are any conflicts with other > > patches currently under development or with other boards. > > That is my mistake. Forget to send it to mailing list. I will drop this patch. > > Something seems to have gone wrong while applying the patch "riscv: > > enable -fdata-sections". This is one of my patches and part of the patch series. > > That is because your patch [PATCH v3 00/28] General fixes / cleanup for RISC-V and improvements to qemu-riscv still have some conflict with master. It conflict with this commit Kbuild: add LDFLAGS_STANDALONE I am hesitate to ask you to send v4 which shall rebase on master yesterday. Finally I decide to merge it by myself. I am not sure it is inappropriate. Maybe I shall ask for you and wait for your v4 patchsets which are rebase on master, right ? > > Can you please consider removing your patch "riscv: cache: Implement i/dcache > > [status, enable, disable]" from this pull request and re- sending it with the next? > > There are still some points you did not reply to in my comments on v2 of your > > patch. For example, I think it makes sense to split this patch into multiple > > patches to make it clearer what it changes. If you want, I can re-send my > > comments in reply to v3 of your patch :) > > In my memory : In v2 you have some suggestions and I reply as below http://u-boot.10912.n7.nabble.com/PATCH-v2-riscv-cache-Implement-i-dcache-s… But in v3 I do not remember you have any comments about v3 http://u-boot.10912.n7.nabble.com/PATCH-v3-riscv-cache-Implement-i-dcache-s… Is it right ? Rick > > Thank you! > > Lukas > > > > > > > arch/nds32/cpu/n1213/start.S | 51 --- > > > ----------- > > > arch/riscv/Kconfig | 34 > > > ++++++--- > > > arch/riscv/Makefile | 20 > > > ++++++ > > > arch/riscv/config.mk | 7 +- > > > arch/riscv/cpu/ax25/Kconfig | 7 ++ > > > arch/riscv/cpu/ax25/Makefile | 1 + > > > arch/riscv/cpu/ax25/cache.c | 95 > > > ++++++++++++++++++++++++++ > > > arch/riscv/cpu/ax25/cpu.c | 4 ++ > > > arch/riscv/cpu/cpu.c | 6 ++ > > > arch/riscv/cpu/qemu/cpu.c | 2 +- > > > arch/riscv/cpu/start.S | 344 > > > +++++++++++++++++++++++++++++++++++++++++++++---------------------- > > > ------------------------- > > > arch/riscv/dts/Makefile | 1 - > > > arch/riscv/dts/ae350.dts | 107 > > > +++++++++++++++++++++++++---- > > > arch/riscv/dts/ae350_32.dts | 229 > > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > arch/riscv/dts/ae350_64.dts | 229 > > > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > arch/riscv/include/asm/barrier.h | 67 > > > ++++++++++++++++++ > > > arch/riscv/include/asm/cache.h | 3 + > > > arch/riscv/include/asm/io.h | 48 +++ > > > ---------- > > > arch/riscv/include/asm/posix_types.h | 6 +- > > > arch/riscv/include/asm/types.h | 4 ++ > > > arch/riscv/lib/bootm.c | 97 > > > ++++++++++++++++++-------- > > > arch/riscv/lib/cache.c | 36 > > > ++++++++-- > > > arch/riscv/lib/interrupts.c | 31 > > > +++++++-- > > > arch/riscv/lib/setjmp.S | 2 +- > > > board/AndesTech/ax25-ae350/ax25-ae350.c | 3 +- > > > board/armltd/integrator/README | 4 +- > > > board/emulation/qemu-riscv/Kconfig | 2 + > > > board/emulation/qemu-riscv/qemu-riscv.c | 73 > > > +++++++++++++++++--- > > > configs/{ax25-ae350_defconfig => a25-ae350_32_defconfig} | 5 +- > > > configs/ax25-ae350_64_defconfig | 39 > > > +++++++++++ > > > configs/qemu-riscv32_defconfig | 5 +- > > > configs/qemu-riscv64_defconfig | 7 +- > > > doc/README.distro | 3 > > +- > > > dts/Makefile | 2 +- > > > include/common.h | 5 -- > > > include/config_distro_bootcmd.h | 21 ++++- > > > - > > > include/configs/qemu-riscv.h | 28 > > > ++++++++ > > > include/dm/ofnode.h | 10 > > +++ > > > scripts/config_whitelist.txt | 1 - > > > tools/.gitignore | 1 + > > > 40 files changed, 1271 insertions(+), 369 deletions(-) create mode > > > 100644 arch/riscv/cpu/ax25/Kconfig create mode 100644 > > > arch/riscv/cpu/ax25/cache.c create mode 100644 > > > arch/riscv/dts/ae350_32.dts create mode 100644 > > > arch/riscv/dts/ae350_64.dts create mode 100644 > > > arch/riscv/include/asm/barrier.h rename configs/{ax25-ae350_defconfig > > > => a25-ae350_32_defconfig} > > > (89%) > > > create mode 100644 configs/ax25-ae350_64_defconfig > > > _______________________________________________ > > > U-Boot mailing list > > > U-Boot(a)lists.denx.de > > > https://lists.denx.de/listinfo/u-boot > CONFIDENTIALITY NOTICE: > > This e-mail (and its attachments) may contain confidential and legally privileged information or information protected from disclosure. If you are not the intended recipient, you are hereby notified that any disclosure, copying, distribution, or use of the information contained herein is strictly prohibited. In this case, please immediately notify the sender by return e-mail, delete the message (and any accompanying documents) and destroy all printed hard copies. Thank you for your cooperation. > > Copyright ANDES TECHNOLOGY CORPORATION - All Rights Reserved.

2 5

[U-Boot] [Uboot]Marvell armada_38x can't detect USB storage device
by 吳冠勳 22 Nov '18

22 Nov '18

Hi all, I've tried the first time booting a self compiled u-boot on armada_38x:CUSTOMER_BOARD_0. Here is the Boot messages: Board: A38x-Customer-Board-0 SoC: MV88F6820 Rev B0 running 2 CPUs CPU: ARM Cortex A9 MPCore (Rev 1) LE CPU 0 CPU @ 1600 [MHz] L2 @ 800 [MHz] TClock @ 200 [MHz] DDR3 @ 800 [MHz] DDR3 32 Bit Width,FastPath Memory Access, DLB Enabled, ECC Disabled RAM Configuration: Bank #0: 00000000 1 GiB Bank #1: 00000000 0 Bytes MMC: mv_sdh: 0 *** Warning - bad CRC, using default environment PCI-e 0: Detected No Link. maxUsbport=1 USB2.0 0: Host Mode USB3.0 0: Host Mode USB3.0 1: Host Mode Map: Code: 0x3fed6000:0x3ff963b0 BSS: 0x3ffef488 Stack: 0x3f4b5f20 Heap: 0x3f4b6000:0x3fed6000 U-Boot Environment: 0x00100000:0x00120000 Board configuration detected: Net: | port | Interface | PHY address | |--------|-----------|--------------| | egiga0 | RGMII | 0x00 | | egiga1 | SGMII | 0x01 | egiga0 [PRIME], egiga1 Hit any key to stop autoboot: 0 Marvell>> usb start (Re)start USB... USB0: usbActive = 0, usbType = 2, usb3HostNum = 2, usb2HostNum = 1 Port (usbActive) : 0 Interface (usbType = 2) : USB EHCI 1.00 scanning bus 0 for devices... New Device 0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x40 ==== get_descriptor:18 ==== set address 1 usb_control_msg: request: 0x5, requesttype: 0x0, value 0x1 index 0x0 length 0x0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x12 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x9 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x200 index 0x0 length 0x19 get_conf_no 0 Result 25, wLength 25 if 0, ep 0 ##EP epmaxpacketin[1] = 8 set configuration 1 usb_control_msg: request: 0x9, requesttype: 0x0, value 0x1 index 0x0 length 0x0 new device strings: Mfr=1, Product=2, SerialNumber=0 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x300 index 0x0 length 0xFF USB device number 1 default language ID 0x1 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x301 index 0x1 length 0xFF usb_control_msg: request: 0x6, requesttype: 0x80, value 0x302 index 0x1 length 0xFF Manufacturer u-boot Product EHCI Host Controller SerialNumber USB hub found usb_control_msg: request: 0x6, requesttype: 0xA0, value 0x2900 index 0x0 length 0x4 usb_control_msg: request: 0x6, requesttype: 0xA0, value 0x2900 index 0x0 length 0x8 1 ports detected individual port power switching standalone hub global over-current protection Single TT TT requires at most 8 FS bit times (666 ns) power on to power good time: 20ms hub controller current requirement: 0mA port 1 is removable usb_control_msg: request: 0x0, requesttype: 0xA0, value 0x0 index 0x0 length 0x4 get_hub_status returned status 1, change 8101 local power source is lost (inactive) no over-current condition exists enabling power on all ports usb_control_msg: request: 0x3, requesttype: 0x23, value 0x8 index 0x1 length 0x0 port 1 returns 0 pgood_delay=20ms ==== Power On ==== devnum=1 poweron: query_delay=100 connect_timeout=1100 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 === Port Status === Port 1 Status 101 Change 1 devnum=1 port=1: USB dev found usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 ##(check port connect)## portstatus 101, change 1, 12 Mb/s usb_control_msg: request: 0x1, requesttype: 0x23, value 0x10 index 0x1 length 0x0 hub_port_reset: resetting port 1... usb_control_msg: request: 0x3, requesttype: 0x23, value 0x4 index 0x1 length 0x0 usb_control_msg: request: 0x0, requesttype: 0xA3, value 0x0 index 0x1 length 0x4 portstatus 103, change 10, 12 Mb/s STAT_C_CONNECTION = 0 STAT_CONNECTION = 1 USB_PORT_STAT_ENABLE 1 usb_control_msg: request: 0x1, requesttype: 0x23, value 0x14 index 0x1 length 0x0 New Device 1 usb_control_msg: request: 0x6, requesttype: 0x80, value 0x100 index 0x0 length 0x40 EHCI timed out on TD - token=0x80008c80 EHCI timed out on TD - token=0x80a88 ==== get_descriptor:-1 ==== usb_new_device: usb_get_descriptor() failed Freeing device node: 1 hub: disabling port 1 usb_control_msg: request: 0x1, requesttype: 0x23, value 0x1 index 0x1 length 0x0 1 USB Device(s) found scan end scanning usb for storage devices... 0 Storage Device(s) found scanning usb for ethernet devices... 0 Ethernet Device(s) found As I plug in USB2.0 storage device,it detected the speed is 12 Mb/s. What causes this happen? Do I have to change something in the default board configuration to successfully use USB on the armada38x? Any help would be appreciated, Pete

1 0

[U-Boot] [PATCH u-boot v3 0/3] Add Amlogic Meson SPI Flash Controller driver
by Neil Armstrong 22 Nov '18

22 Nov '18

The Amlogic Meson SoCs embeds a Flash oriented SPI Controller name SPIFC. This patchset add the driver ported from linux, but also import the regmap regmap_read_poll_timeout() to implify the register polling in the driver. Neil Armstrong (3): regmap: add regmap_read_poll_timeout() helper test: regmap: add regmap_read_poll_timeout test spi: Add Amlogic Meson SPI Flash Controller driver drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/meson_spifc.c | 330 ++++++++++++++++++++++++++++++++++++++ include/regmap.h | 38 +++++ test/dm/regmap.c | 26 +++ 5 files changed, 403 insertions(+) create mode 100644 drivers/spi/meson_spifc.c -- 2.19.1

3 10

[U-Boot] [PATCH v2] sun8i: h3: Add support for the Beelink-x2 STB
by codekipper＠gmail.com 22 Nov '18

22 Nov '18

From: Marcus Cooper <marcusc(a)axis.com> The Beelink X2 is an STB based on the Allwinner H3 SoC with a uSD slot, 2 USB ports( 1 * USB-2 Host, 1 USB OTG), a 10/100M ethernet port using the SoC's integrated PHY, Wifi via an sdio wifi chip, HDMI, an IR receiver, a dual colour LED and an optical S/PDIF connector. Signed-off-by: Marcus Cooper <codekipper(a)gmail.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun8i-h3-beelink-x2.dts | 179 +++++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 + configs/beelink_x2_defconfig | 19 +++ 4 files changed, 204 insertions(+) create mode 100644 arch/arm/dts/sun8i-h3-beelink-x2.dts create mode 100644 configs/beelink_x2_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 1cbb45d679..cc217d4f98 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -370,6 +370,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h2-plus-orangepi-r1.dtb \ sun8i-h2-plus-orangepi-zero.dtb \ sun8i-h3-bananapi-m2-plus.dtb \ + sun8i-h3-beelink-x2.dtb \ sun8i-h3-libretech-all-h3-cc.dtb \ sun8i-h3-nanopi-m1.dtb \ sun8i-h3-nanopi-m1-plus.dtb \ diff --git a/arch/arm/dts/sun8i-h3-beelink-x2.dts b/arch/arm/dts/sun8i-h3-beelink-x2.dts new file mode 100644 index 0000000000..683c5c31a9 --- /dev/null +++ b/arch/arm/dts/sun8i-h3-beelink-x2.dts @@ -0,0 +1,179 @@ +// SPDX-License-Identifier: GPL-2.0+ +// +// Device Tree Source for Beelink X2 +// +// Copyright (C) 2018 Marcus Cooper <codekipper(a)gmail.com> +/dts-v1/; +#include "sun8i-h3.dtsi" +#include "sunxi-common-regulators.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Beelink X2"; + compatible = "roofull,beelink-x2", "allwinner,sun8i-h3"; + + aliases { + serial0 = &uart0; + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet1 = &sdiowifi; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi_out_con>; + }; + }; + }; + + leds { + compatible = "gpio-leds"; + + blue { + label = "beelink-x2:blue:pwr"; + gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ + default-state = "on"; + }; + + red { + label = "beelink-x2:red:standby"; + gpios = <&pio 0 15 GPIO_ACTIVE_HIGH>; /* PA15 */ + }; + }; + + wifi_pwrseq: wifi_pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + }; + + sound_spdif { + compatible = "simple-audio-card"; + simple-audio-card,name = "On-board SPDIF"; + + simple-audio-card,cpu { + sound-dai = <&spdif>; + }; + + simple-audio-card,codec { + sound-dai = <&spdif_out>; + }; + }; + + spdif_out: spdif-out { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + }; +}; + +&de { + status = "okay"; +}; + +&ehci0 { + status = "okay"; +}; + +&ehci1 { + status = "okay"; +}; + +&emac { + phy-handle = <&int_mii_phy>; + phy-mode = "mii"; + allwinner,leds-active-low; + status = "okay"; +}; + +&hdmi { + status = "okay"; +}; + +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + +&ir { + pinctrl-names = "default"; + pinctrl-0 = <&ir_pins_a>; + status = "okay"; +}; + +&mmc0 { + vmmc-supply = <&reg_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ + status = "okay"; +}; + +&mmc1 { + vmmc-supply = <&reg_vcc3v3>; + bus-width = <4>; + non-removable; + status = "okay"; + + /* + * Explicitly define the sdio device, so that we can add an ethernet + * alias for it (which e.g. makes u-boot set a mac-address). + */ + sdiowifi: sdio_wifi@1 { + reg = <1>; + }; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <&reg_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&ohci1 { + status = "okay"; +}; + +&reg_usb0_vbus { + gpio = <&r_pio 0 2 GPIO_ACTIVE_HIGH>; /* PL2 */ + status = "okay"; +}; + +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&spdif_tx_pins_a>; + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; + status = "okay"; +}; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usbphy { + /* USB VBUS is always on except for the OTG port */ + status = "okay"; + usb0_id_det-gpios = <&pio 0 7 GPIO_ACTIVE_HIGH>; /* PA07 */ + usb0_vbus-supply = <&reg_usb0_vbus>; +}; diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 478e37285f..6417158fd1 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -159,6 +159,11 @@ M: Jagan Teki <jagan(a)amarulasolutions.com> S: Maintained F: configs/bananapi_m64_defconfig +BEELINK X2 BOARD +M: Marcus Cooper <codekipper(a)gmail.com> +S: Maintained +F: configs/beelink_x2_defconfig + COLOMBUS BOARD M: Maxime Ripard <maxime.ripard(a)bootlin.com> S: Maintained diff --git a/configs/beelink_x2_defconfig b/configs/beelink_x2_defconfig new file mode 100644 index 0000000000..6508e470a0 --- /dev/null +++ b/configs/beelink_x2_defconfig @@ -0,0 +1,19 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL=y +CONFIG_MACH_SUN8I_H3=y +CONFIG_DRAM_CLK=624 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-beelink-x2" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_CONSOLE_MUX=y +CONFIG_SPL_I2C_SUPPORT=y +# CONFIG_CMD_FLASH is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SUN8I_EMAC=y +CONFIG_SY8106A_POWER=y +CONFIG_USB_EHCI_HCD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y -- 2.19.1

2 1

[U-Boot] [PATCH] sunxi: Fix memory 2-rank initialization for a33 cpu
by Michael Trimarchi 22 Nov '18

22 Nov '18

When we initialize the memory we need to autodetect rank and size but this can happen only if we send the proper reset to both memory module including cke signal. For this reason we need initialize the physical on both channel because we need to presume that both are connected. This way let the CLKE to be activated at the right time with the memory reset coming from the cpu Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- arch/arm/mach-sunxi/dram_sun8i_a33.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c index d9aa0c6d7e..1da2727f98 100644 --- a/arch/arm/mach-sunxi/dram_sun8i_a33.c +++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c @@ -334,7 +334,7 @@ unsigned long sunxi_dram_init(void) struct dram_para para = { .cs1 = 0, .bank = 1, - .rank = 1, + .rank = 2, .rows = 15, .bus_width = 16, .page_size = 2048, -- 2.17.1

4 4

[U-Boot] [PATCH v2 0/3] sunxi-mmc: enable new clock mode on A64
by Vasily Khoruzhick 22 Nov '18

22 Nov '18

A64 requires new clock mode on SD and eMMC controllers. Not using new clock mode causes stability issues of the driver - SPL may occasionally fail to load u-boot from SD for some particular SD card on some particular devices. This series depends on "sunxi: add support for automatic delay calibration" from my Pinebook series. Tested on Pinebook and Pine64-LTS. Fixes eMMC failures on Olinuxino-A64 [1] [1] https://github.com/armbian/build/commit/03199b3879af24c94029460b8cdf0d41048… Vasily Khoruzhick (3): sunxi-mmc: introduce new MMC_SUNXI_HAS_MODE_SWITCH option sunxi-mmc: don't double clock for new mode unconditionally sunxi-mmc: use new mode on both controllers on A64 arch/arm/mach-sunxi/Kconfig | 2 ++ drivers/mmc/Kconfig | 4 ++++ drivers/mmc/sunxi_mmc.c | 19 +++++++++---------- 3 files changed, 15 insertions(+), 10 deletions(-) -- 2.19.1

2 9