August 2016 - U-Boot

[U-Boot] [PATCH] common: cli_readline: Improve command line editing
by James Byrne 21 Aug '16

21 Aug '16

This improves the cread_line() function so that it will correctly process the 'Home', 'End', 'Delete' and arrow key escape sequences produced by various terminal emulators. This makes command line editing a more pleasant experience. The previous code only supported the cursor keys and the 'Home' key, and only for certain terminal emulator configurations. This adds support for the 'End and 'Delete' keys, and recognises a wider range of escape sequences. For example, the left arrow key can be 'ESC O D' instead of 'ESC [ D', and the 'Home' key can be 'ESC [ H', 'ESC O H', 'ESC 1 ~' or 'ESC 7 ~', depending on what terminal emulator you use and how it is configured. Signed-off-by: James Byrne <james.byrne(a)origamienergy.com> --- common/cli_readline.c | 108 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 78 insertions(+), 30 deletions(-) diff --git a/common/cli_readline.c b/common/cli_readline.c index c1476e4..0d4ad49 100644 --- a/common/cli_readline.c +++ b/common/cli_readline.c @@ -283,46 +283,94 @@ static int cread_line(const char *const prompt, char *buf, unsigned int *len, * handle standard linux xterm esc sequences for arrow key, etc. */ if (esc_len != 0) { + enum { ESC_REJECT, ESC_SAVE, ESC_CONVERTED } act; + if (esc_len == 1) { - if (ichar == '[') { - esc_save[esc_len] = ichar; - esc_len = 2; + if (ichar == '[' || ichar == 'O') + act = ESC_SAVE; + else + act = ESC_REJECT; + } else if (esc_len == 2) { + switch (ichar) { + case 'D': /* <- key */ + ichar = CTL_CH('b'); + act = ESC_CONVERTED; + break; /* pass off to ^B handler */ + case 'C': /* -> key */ + ichar = CTL_CH('f'); + act = ESC_CONVERTED; + break; /* pass off to ^F handler */ + case 'H': /* Home key */ + ichar = CTL_CH('a'); + act = ESC_CONVERTED; + break; /* pass off to ^A handler */ + case 'F': /* End key */ + ichar = CTL_CH('e'); + act = ESC_CONVERTED; + break; /* pass off to ^E handler */ + case 'A': /* up arrow */ + ichar = CTL_CH('p'); + act = ESC_CONVERTED; + break; /* pass off to ^P handler */ + case 'B': /* down arrow */ + ichar = CTL_CH('n'); + act = ESC_CONVERTED; + break; /* pass off to ^N handler */ + case '1': + case '3': + case '4': + case '7': + case '8': + if (esc_save[1] == '[') { + /* see if next character is ~ */ + act = ESC_SAVE; + } else { + act = ESC_REJECT; + } + break; + default: + act = ESC_REJECT; + break; + } + } else if (esc_len == 3) { + if (ichar == '~') { + switch (esc_save[2]) { + case '3': /* Delete key */ + ichar = CTL_CH('d'); + act = ESC_CONVERTED; + break; /* pass to ^D handler */ + case '1': /* Home key */ + case '7': + ichar = CTL_CH('a'); + act = ESC_CONVERTED; + break; /* pass to ^A handler */ + case '4': /* End key */ + case '8': + ichar = CTL_CH('e'); + act = ESC_CONVERTED; + break; /* pass to ^E handler */ + default: + act = ESC_REJECT; + break; + } } else { - cread_add_str(esc_save, esc_len, - insert, &num, &eol_num, - buf, *len); - esc_len = 0; + act = ESC_REJECT; } - continue; } - switch (ichar) { - case 'D': /* <- key */ - ichar = CTL_CH('b'); - esc_len = 0; - break; - case 'C': /* -> key */ - ichar = CTL_CH('f'); - esc_len = 0; - break; /* pass off to ^F handler */ - case 'H': /* Home key */ - ichar = CTL_CH('a'); - esc_len = 0; - break; /* pass off to ^A handler */ - case 'A': /* up arrow */ - ichar = CTL_CH('p'); - esc_len = 0; - break; /* pass off to ^P handler */ - case 'B': /* down arrow */ - ichar = CTL_CH('n'); - esc_len = 0; - break; /* pass off to ^N handler */ - default: + switch (act) { + case ESC_SAVE: + esc_save[esc_len++] = ichar; + continue; + case ESC_REJECT: esc_save[esc_len++] = ichar; cread_add_str(esc_save, esc_len, insert, &num, &eol_num, buf, *len); esc_len = 0; continue; + case ESC_CONVERTED: + esc_len = 0; + break; } } -- 1.9.1

2 5

[U-Boot] [PATCH 1/2] fastboot: implement Kconfig
by Steve Rae 21 Aug '16

21 Aug '16

implement Kconfig for the 'fastboot' feature set Signed-off-by: Steve Rae <steve.rae(a)raedomain.com> --- It did not seem feasible to use the "moveconfig.py" tool -- mostly because some of these configurations use defines rather than actual values... In addition, implemented "config FASTBOOT" enable/disable for this entire Kconfig capability, so that the existing "include/configs/*.h" capability would not conflict.... cmd/Kconfig | 2 ++ cmd/fastboot/Kconfig | 60 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/Kconfig | 5 ++++ 3 files changed, 67 insertions(+) create mode 100644 cmd/fastboot/Kconfig diff --git a/cmd/Kconfig b/cmd/Kconfig index d69b817..308a0c8 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -114,6 +114,8 @@ config AUTOBOOT_STOP_STR_SHA256 endmenu +source "cmd/fastboot/Kconfig" + comment "Commands" menu "Info commands" diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig new file mode 100644 index 0000000..a93d1c0 --- /dev/null +++ b/cmd/fastboot/Kconfig @@ -0,0 +1,60 @@ +comment "FASTBOOT" + +config FASTBOOT + bool "" + +menu "Fastboot support" + depends on FASTBOOT + +config USB_FUNCTION_FASTBOOT + bool "Enable USB fastboot gadget" + help + This enables the USB part of the fastboot gadget. + +config CMD_FASTBOOT + bool "Enable FASTBOOT command" + help + This enables the command "fastboot" which enables the Android + fastboot mode for the platform's USB device. Fastboot is a USB + protocol for downloading images, flashing and device control + used on Android devices. + +config ANDROID_BOOT_IMAGE + bool "Enable support for Android Boot Images" + help + This enables support for booting images which use the Android + image format header. + +if USB_FUNCTION_FASTBOOT + +config FASTBOOT_BUF_ADDR + hex "Define FASTBOOT buffer address" + help + The fastboot protocol requires a large memory buffer for + downloads. Define this to the starting RAM address to use for + downloaded images. + +config FASTBOOT_BUF_SIZE + hex "Define FASTBOOT buffer size" + help + The fastboot protocol requires a large memory buffer for + downloads. This buffer should be as large as possible for a + platform. Define this to the size available RAM for fastboot. + +config FASTBOOT_FLASH + bool "Enable FASTBOOT FLASH command" + help + The fastboot protocol includes a "flash" command for writing + the downloaded image to a non-volatile storage device. Define + this to enable the "fastboot flash" command. + +config FASTBOOT_FLASH_MMC_DEV + int "Define FASTBOOT MMC FLASH default device" + help + The fastboot "flash" command requires additional information + regarding the non-volatile storage device. Define this to + the eMMC device that fastboot should use to store the image. + +endif # USB_FUNCTION_FASTBOOT + +endmenu diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index ae62476..40839d8 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -43,6 +43,11 @@ config USB_GADGET_ATMEL_USBA USBA is the integrated high-speed USB Device controller on the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel. +config USB_GADGET_BCM_UDC_OTG_PHY + bool "Broadcom UDC OTG PHY" + help + Enable the Broadcom UDC OTG physical device interface. + config USB_GADGET_DWC2_OTG bool "DesignWare USB2.0 HS OTG controller (gadget mode)" select USB_GADGET_DUALSPEED -- 1.8.5

2 3

[U-Boot] [PATCH v2] cmd: efi_loader: Return CMD_RET_USAGE in case of not enough arguments
by Bin Meng 21 Aug '16

21 Aug '16

When typing 'bootefi' from U-Boot shell, nothing outputs. Like other commands, return CMD_RET_USAGE so that it can print help message. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Alexander Graf <agraf(a)suse.de> --- Changes in v2: - Rebase against origin/master instead of dm/uefi-working cmd/bootefi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/bootefi.c b/cmd/bootefi.c index b52ba9c..21fe42c 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -226,7 +226,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int r = 0; if (argc < 2) - return 1; + return CMD_RET_USAGE; saddr = argv[1]; addr = simple_strtoul(saddr, NULL, 16); -- 2.9.2

2 1

[U-Boot] [PATCH v3 1/3] cmd: Split 'bootz' and 'booti' out from 'bootm'
by Tom Rini 21 Aug '16

21 Aug '16

The bootz and booti commands rely on common functionality that is found in common/bootm.c and common/bootm_os.c. They do not however rely on the rest of cmd/bootm.c to be implemented so split them into their own files. Have various Makefiles include the required infrastructure for CONFIG_CMD_BOOT[IZ] as well as CONFIG_CMD_BOOTM. Move the declaration of 'images' over to common/bootm.c. Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v3: - Fix a number of problems found when Masahiro pointed out that this patch didn't allow for BOOTZ+!BOOTM to build --- arch/arm/lib/Makefile | 3 +- arch/sandbox/lib/Makefile | 1 + cmd/Makefile | 2 + cmd/booti.c | 161 +++++++++++++++++++++++++++++ cmd/bootm.c | 250 ---------------------------------------------- cmd/bootz.c | 106 ++++++++++++++++++++ common/Makefile | 2 + common/bootm.c | 2 + 8 files changed, 276 insertions(+), 251 deletions(-) create mode 100644 cmd/booti.c create mode 100644 cmd/bootz.c diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index a8d155762937..caa62c635589 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -26,8 +26,9 @@ endif obj-$(CONFIG_CPU_V7M) += cmd_boot.o obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o +obj-$(CONFIG_CMD_BOOTI) += bootm.o obj-$(CONFIG_CMD_BOOTM) += bootm.o -obj-$(CONFIG_CMD_BOOTM) += zimage.o +obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o obj-$(CONFIG_USE_ARCH_MEMSET) += memset.o obj-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile index 7820c55c8554..2e7802feac8a 100644 --- a/arch/sandbox/lib/Makefile +++ b/arch/sandbox/lib/Makefile @@ -12,3 +12,4 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_PCI) += pci_io.o endif obj-$(CONFIG_CMD_BOOTM) += bootm.o +obj-$(CONFIG_CMD_BOOTZ) += bootm.o diff --git a/cmd/Makefile b/cmd/Makefile index a1731be70127..a1ecf73ef314 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -26,6 +26,8 @@ obj-$(CONFIG_CMD_BOOTEFI) += bootefi.o obj-$(CONFIG_CMD_BOOTMENU) += bootmenu.o obj-$(CONFIG_CMD_BOOTLDR) += bootldr.o obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o +obj-$(CONFIG_CMD_BOOTZ) += bootz.o +obj-$(CONFIG_CMD_BOOTI) += booti.o obj-$(CONFIG_CMD_CACHE) += cache.o obj-$(CONFIG_CMD_CBFS) += cbfs.o obj-$(CONFIG_CMD_CLK) += clk.o diff --git a/cmd/booti.c b/cmd/booti.c new file mode 100644 index 000000000000..6c1c998a568c --- /dev/null +++ b/cmd/booti.c @@ -0,0 +1,161 @@ +/* + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <bootm.h> +#include <command.h> +#include <image.h> +#include <lmb.h> +#include <mapmem.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* See Documentation/arm64/booting.txt in the Linux kernel */ +struct Image_header { + uint32_t code0; /* Executable code */ + uint32_t code1; /* Executable code */ + uint64_t text_offset; /* Image load offset, LE */ + uint64_t image_size; /* Effective Image size, LE */ + uint64_t res1; /* reserved */ + uint64_t res2; /* reserved */ + uint64_t res3; /* reserved */ + uint64_t res4; /* reserved */ + uint32_t magic; /* Magic number */ + uint32_t res5; +}; + +#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241 + +static int booti_setup(bootm_headers_t *images) +{ + struct Image_header *ih; + uint64_t dst; + uint64_t image_size; + + ih = (struct Image_header *)map_sysmem(images->ep, 0); + + if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) { + puts("Bad Linux ARM64 Image magic!\n"); + return 1; + } + + if (ih->image_size == 0) { + puts("Image lacks image_size field, assuming 16MiB\n"); + image_size = 16 << 20; + } else { + image_size = le64_to_cpu(ih->image_size); + } + + /* + * If we are not at the correct run-time location, set the new + * correct location and then move the image there. + */ + dst = gd->bd->bi_dram[0].start + le64_to_cpu(ih->text_offset); + + unmap_sysmem(ih); + + if (images->ep != dst) { + void *src; + + debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst); + + src = (void *)images->ep; + images->ep = dst; + memmove((void *)dst, src, image_size); + } + + return 0; +} + +/* + * Image booting support + */ +static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[], bootm_headers_t *images) +{ + int ret; + struct Image_header *ih; + + ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, + images, 1); + + /* Setup Linux kernel Image entry point */ + if (!argc) { + images->ep = load_addr; + debug("* kernel: default image load address = 0x%08lx\n", + load_addr); + } else { + images->ep = simple_strtoul(argv[0], NULL, 16); + debug("* kernel: cmdline image address = 0x%08lx\n", + images->ep); + } + + ret = booti_setup(images); + if (ret != 0) + return 1; + + ih = (struct Image_header *)map_sysmem(images->ep, 0); + + lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size)); + + unmap_sysmem(ih); + + /* + * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not + * have a header that provide this informaiton. + */ + if (bootm_find_images(flag, argc, argv)) + return 1; + + return 0; +} + +int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + int ret; + + /* Consume 'booti' */ + argc--; argv++; + + if (booti_start(cmdtp, flag, argc, argv, &images)) + return 1; + + /* + * We are doing the BOOTM_STATE_LOADOS state ourselves, so must + * disable interrupts ourselves + */ + bootm_disable_interrupts(); + + images.os.os = IH_OS_LINUX; + ret = do_bootm_states(cmdtp, flag, argc, argv, + BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | + BOOTM_STATE_OS_GO, + &images, 1); + + return ret; +} + +#ifdef CONFIG_SYS_LONGHELP +static char booti_help_text[] = + "[addr [initrd[:size]] [fdt]]\n" + " - boot arm64 Linux Image stored in memory\n" + "\tThe argument 'initrd' is optional and specifies the address\n" + "\tof an initrd in memory. The optional parameter ':size' allows\n" + "\tspecifying the size of a RAW initrd.\n" +#if defined(CONFIG_OF_LIBFDT) + "\tSince booting a Linux kernel requires a flat device-tree, a\n" + "\tthird argument providing the address of the device-tree blob\n" + "\tis required. To boot a kernel with a device-tree blob but\n" + "\twithout an initrd image, use a '-' for the initrd argument.\n" +#endif + ""; +#endif + +U_BOOT_CMD( + booti, CONFIG_SYS_MAXARGS, 1, do_booti, + "boot arm64 Linux Image image from memory", booti_help_text +); diff --git a/cmd/bootm.c b/cmd/bootm.c index 16fdea5507be..e02a1c54b70c 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -14,12 +14,9 @@ #include <environment.h> #include <errno.h> #include <image.h> -#include <lmb.h> #include <malloc.h> -#include <mapmem.h> #include <nand.h> #include <asm/byteorder.h> -#include <linux/compiler.h> #include <linux/ctype.h> #include <linux/err.h> #include <u-boot/zlib.h> @@ -40,8 +37,6 @@ extern flash_info_t flash_info[]; /* info for FLASH chips */ static int do_imls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #endif -bootm_headers_t images; /* pointers to os/initrd/fdt images */ - /* we overload the cmd field with our state machine info instead of a * function pointer */ static cmd_tbl_t cmd_bootm_sub[] = { @@ -540,248 +535,3 @@ U_BOOT_CMD( " boundaries in nor/nand flash." ); #endif - -#ifdef CONFIG_CMD_BOOTZ - -int __weak bootz_setup(ulong image, ulong *start, ulong *end) -{ - /* Please define bootz_setup() for your platform */ - - puts("Your platform's zImage format isn't supported yet!\n"); - return -1; -} - -/* - * zImage booting support - */ -static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[], bootm_headers_t *images) -{ - int ret; - ulong zi_start, zi_end; - - ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, - images, 1); - - /* Setup Linux kernel zImage entry point */ - if (!argc) { - images->ep = load_addr; - debug("* kernel: default image load address = 0x%08lx\n", - load_addr); - } else { - images->ep = simple_strtoul(argv[0], NULL, 16); - debug("* kernel: cmdline image address = 0x%08lx\n", - images->ep); - } - - ret = bootz_setup(images->ep, &zi_start, &zi_end); - if (ret != 0) - return 1; - - lmb_reserve(&images->lmb, images->ep, zi_end - zi_start); - - /* - * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not - * have a header that provide this informaiton. - */ - if (bootm_find_images(flag, argc, argv)) - return 1; - - return 0; -} - -int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - int ret; - - /* Consume 'bootz' */ - argc--; argv++; - - if (bootz_start(cmdtp, flag, argc, argv, &images)) - return 1; - - /* - * We are doing the BOOTM_STATE_LOADOS state ourselves, so must - * disable interrupts ourselves - */ - bootm_disable_interrupts(); - - images.os.os = IH_OS_LINUX; - ret = do_bootm_states(cmdtp, flag, argc, argv, - BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | - BOOTM_STATE_OS_GO, - &images, 1); - - return ret; -} - -#ifdef CONFIG_SYS_LONGHELP -static char bootz_help_text[] = - "[addr [initrd[:size]] [fdt]]\n" - " - boot Linux zImage stored in memory\n" - "\tThe argument 'initrd' is optional and specifies the address\n" - "\tof the initrd in memory. The optional argument ':size' allows\n" - "\tspecifying the size of RAW initrd.\n" -#if defined(CONFIG_OF_LIBFDT) - "\tWhen booting a Linux kernel which requires a flat device-tree\n" - "\ta third argument is required which is the address of the\n" - "\tdevice-tree blob. To boot that kernel without an initrd image,\n" - "\tuse a '-' for the second argument. If you do not pass a third\n" - "\ta bd_info struct will be passed instead\n" -#endif - ""; -#endif - -U_BOOT_CMD( - bootz, CONFIG_SYS_MAXARGS, 1, do_bootz, - "boot Linux zImage image from memory", bootz_help_text -); -#endif /* CONFIG_CMD_BOOTZ */ - -#ifdef CONFIG_CMD_BOOTI -/* See Documentation/arm64/booting.txt in the Linux kernel */ -struct Image_header { - uint32_t code0; /* Executable code */ - uint32_t code1; /* Executable code */ - uint64_t text_offset; /* Image load offset, LE */ - uint64_t image_size; /* Effective Image size, LE */ - uint64_t res1; /* reserved */ - uint64_t res2; /* reserved */ - uint64_t res3; /* reserved */ - uint64_t res4; /* reserved */ - uint32_t magic; /* Magic number */ - uint32_t res5; -}; - -#define LINUX_ARM64_IMAGE_MAGIC 0x644d5241 - -static int booti_setup(bootm_headers_t *images) -{ - struct Image_header *ih; - uint64_t dst; - uint64_t image_size; - - ih = (struct Image_header *)map_sysmem(images->ep, 0); - - if (ih->magic != le32_to_cpu(LINUX_ARM64_IMAGE_MAGIC)) { - puts("Bad Linux ARM64 Image magic!\n"); - return 1; - } - - if (ih->image_size == 0) { - puts("Image lacks image_size field, assuming 16MiB\n"); - image_size = 16 << 20; - } else { - image_size = le64_to_cpu(ih->image_size); - } - - /* - * If we are not at the correct run-time location, set the new - * correct location and then move the image there. - */ - dst = gd->bd->bi_dram[0].start + le64_to_cpu(ih->text_offset); - - unmap_sysmem(ih); - - if (images->ep != dst) { - void *src; - - debug("Moving Image from 0x%lx to 0x%llx\n", images->ep, dst); - - src = (void *)images->ep; - images->ep = dst; - memmove((void *)dst, src, image_size); - } - - return 0; -} - -/* - * Image booting support - */ -static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[], bootm_headers_t *images) -{ - int ret; - struct Image_header *ih; - - ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, - images, 1); - - /* Setup Linux kernel Image entry point */ - if (!argc) { - images->ep = load_addr; - debug("* kernel: default image load address = 0x%08lx\n", - load_addr); - } else { - images->ep = simple_strtoul(argv[0], NULL, 16); - debug("* kernel: cmdline image address = 0x%08lx\n", - images->ep); - } - - ret = booti_setup(images); - if (ret != 0) - return 1; - - ih = (struct Image_header *)map_sysmem(images->ep, 0); - - lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size)); - - unmap_sysmem(ih); - - /* - * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not - * have a header that provide this informaiton. - */ - if (bootm_find_images(flag, argc, argv)) - return 1; - - return 0; -} - -int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - int ret; - - /* Consume 'booti' */ - argc--; argv++; - - if (booti_start(cmdtp, flag, argc, argv, &images)) - return 1; - - /* - * We are doing the BOOTM_STATE_LOADOS state ourselves, so must - * disable interrupts ourselves - */ - bootm_disable_interrupts(); - - images.os.os = IH_OS_LINUX; - ret = do_bootm_states(cmdtp, flag, argc, argv, - BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | - BOOTM_STATE_OS_GO, - &images, 1); - - return ret; -} - -#ifdef CONFIG_SYS_LONGHELP -static char booti_help_text[] = - "[addr [initrd[:size]] [fdt]]\n" - " - boot arm64 Linux Image stored in memory\n" - "\tThe argument 'initrd' is optional and specifies the address\n" - "\tof an initrd in memory. The optional parameter ':size' allows\n" - "\tspecifying the size of a RAW initrd.\n" -#if defined(CONFIG_OF_LIBFDT) - "\tSince booting a Linux kernel requires a flat device-tree, a\n" - "\tthird argument providing the address of the device-tree blob\n" - "\tis required. To boot a kernel with a device-tree blob but\n" - "\twithout an initrd image, use a '-' for the initrd argument.\n" -#endif - ""; -#endif - -U_BOOT_CMD( - booti, CONFIG_SYS_MAXARGS, 1, do_booti, - "boot arm64 Linux Image image from memory", booti_help_text -); -#endif /* CONFIG_CMD_BOOTI */ diff --git a/cmd/bootz.c b/cmd/bootz.c new file mode 100644 index 000000000000..9648fe9948d5 --- /dev/null +++ b/cmd/bootz.c @@ -0,0 +1,106 @@ +/* + * (C) Copyright 2000-2009 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <bootm.h> +#include <command.h> +#include <lmb.h> +#include <linux/compiler.h> + +int __weak bootz_setup(ulong image, ulong *start, ulong *end) +{ + /* Please define bootz_setup() for your platform */ + + puts("Your platform's zImage format isn't supported yet!\n"); + return -1; +} + +/* + * zImage booting support + */ +static int bootz_start(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[], bootm_headers_t *images) +{ + int ret; + ulong zi_start, zi_end; + + ret = do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START, + images, 1); + + /* Setup Linux kernel zImage entry point */ + if (!argc) { + images->ep = load_addr; + debug("* kernel: default image load address = 0x%08lx\n", + load_addr); + } else { + images->ep = simple_strtoul(argv[0], NULL, 16); + debug("* kernel: cmdline image address = 0x%08lx\n", + images->ep); + } + + ret = bootz_setup(images->ep, &zi_start, &zi_end); + if (ret != 0) + return 1; + + lmb_reserve(&images->lmb, images->ep, zi_end - zi_start); + + /* + * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not + * have a header that provide this informaiton. + */ + if (bootm_find_images(flag, argc, argv)) + return 1; + + return 0; +} + +int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + int ret; + + /* Consume 'bootz' */ + argc--; argv++; + + if (bootz_start(cmdtp, flag, argc, argv, &images)) + return 1; + + /* + * We are doing the BOOTM_STATE_LOADOS state ourselves, so must + * disable interrupts ourselves + */ + bootm_disable_interrupts(); + + images.os.os = IH_OS_LINUX; + ret = do_bootm_states(cmdtp, flag, argc, argv, + BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | + BOOTM_STATE_OS_GO, + &images, 1); + + return ret; +} + +#ifdef CONFIG_SYS_LONGHELP +static char bootz_help_text[] = + "[addr [initrd[:size]] [fdt]]\n" + " - boot Linux zImage stored in memory\n" + "\tThe argument 'initrd' is optional and specifies the address\n" + "\tof the initrd in memory. The optional argument ':size' allows\n" + "\tspecifying the size of RAW initrd.\n" +#if defined(CONFIG_OF_LIBFDT) + "\tWhen booting a Linux kernel which requires a flat device-tree\n" + "\ta third argument is required which is the address of the\n" + "\tdevice-tree blob. To boot that kernel without an initrd image,\n" + "\tuse a '-' for the second argument. If you do not pass a third\n" + "\ta bd_info struct will be passed instead\n" +#endif + ""; +#endif + +U_BOOT_CMD( + bootz, CONFIG_SYS_MAXARGS, 1, do_bootz, + "boot Linux zImage image from memory", bootz_help_text +); diff --git a/common/Makefile b/common/Makefile index e08cd3e74d7d..21619b304d0f 100644 --- a/common/Makefile +++ b/common/Makefile @@ -26,6 +26,8 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o +obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o +obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o # environment obj-y += env_attr.o diff --git a/common/bootm.c b/common/bootm.c index 9ed6428281b3..a4d22a6ec490 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -41,6 +41,8 @@ DECLARE_GLOBAL_DATA_PTR; +bootm_headers_t images; /* pointers to os/initrd/fdt images */ + static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], bootm_headers_t *images, ulong *os_data, ulong *os_len); -- 1.9.1

1 5

[U-Boot] [PATCH v4 00/13] cmd: fdt: Add device tree overlays support
by Maxime Ripard 21 Aug '16

21 Aug '16

Hi, The device tree overlays are a great solution to the issue raised by the bunch expandable boards we find everywhere these days, like the Beaglebone, Raspberry Pi or CHIP. However, most of the time, the overlays are applied through a mechanism involving the firmware request interface in Linux, that is only fully functional once the userspace has been mounted and is running. Some expansion boards might need to be enabled before that, because they simply need to patch the DT early on, or need to be initialized early in order to be fully functional, or because they provide access to the root filesystem. In these cases, having the bootloader applying the overlay before Linux starts seems like the easiest solution. This implementation doesn't provide all the Linux fancyness though, there's no transactional application, which means that if the overlay cannot be applied for a reason while you're still halfway through the application, you're probably screwed. It also cannot remove an overlay, but I don't think that it is currently a use-case. There's still a bunch of work to extend the libfdt unit tests to test the new functions introduced, but these patches will be submitted in a near future, once things settle down. Let me know what you think, Maxime Changes from v3: - Moved the patch to introduce fdt_getprop_namelen_w earlier to keep bisectability - Renamed fdt_setprop_inplace_namelen_by_index in fdt_setprop_inplace_namelen_partial - Reintroduced the check on the property length in fdt_setprop_inplace - Made sure the code was taking the non 32bits-aligned phandles - Used memchr instead of strchr in the fixup parsing code, and made sure the cases where the fixup format was wrong was reported as an error. - Fixed a bug where a property in a overlay having multiple phandles local to that overlay would only resolve the first one. Also added a test case for this - Added kerneldocs for all the overlay functions - Added a patch to fix a typo in separator - A few fixes, function renamings, error checking changes here and there Changes from v2: - Add Kconfig option for the libfdt overlay support - Reworked the code to deal with Pantelis and David numerous comments, among which: * Remove the need for malloc in the overlay code, and added some libfdt functions to do that * Remove the DT magic in case of an error to not be able to use it anymore * Removed the fdt_ and _ function prefix for the static functions * Plus the usual bunch of rework, error checking and optimizations. - Added new tests to deal with bugs reported by David (the overlay was not applying when you add a subnode declared that was already in the base device tree, and using a local phandle was only working if the property storing it only had a length of 4). Changes from v1: - Moved the overlay code to libfdt - Added unit tests - Refactored the code to reduce the amount of memory allocation - No longer modify the overlay itself, but create a copy to operate on instead. - Removed the limitations on the fixups path, names and properties length - Fixed a few things here and there according to comments Maxime Ripard (13): cmd: fdt: Narrow the check for fdt addr scripts: Makefile.lib: Sanitize DTB names vsprintf: Include stdarg for va_list libfdt: Add new headers and defines libfdt: Add iterator over properties libfdt: Add max phandle retrieval function libfdt: Fix separator spelling libfdt: Add fdt_path_offset_namelen libfdt: Add fdt_getprop_namelen_w libfdt: Add fdt_setprop_inplace_namelen_partial libfdt: Add overlay application function cmd: fdt: add fdt overlay application subcommand tests: Introduce DT overlay tests Makefile | 1 + cmd/fdt.c | 26 +- include/libfdt.h | 111 ++++++- include/libfdt_env.h | 6 + include/test/overlay.h | 16 + include/test/suites.h | 1 + include/vsprintf.h | 2 + lib/Kconfig | 5 + lib/libfdt/Makefile | 2 + lib/libfdt/fdt_overlay.c | 618 ++++++++++++++++++++++++++++++++++++++ lib/libfdt/fdt_ro.c | 46 ++- lib/libfdt/fdt_wip.c | 29 +- scripts/Makefile.lib | 8 +- test/Kconfig | 1 + test/cmd_ut.c | 6 + test/overlay/Kconfig | 11 + test/overlay/Makefile | 15 + test/overlay/cmd_ut_overlay.c | 268 +++++++++++++++++ test/overlay/test-fdt-base.dts | 21 ++ test/overlay/test-fdt-overlay.dts | 96 ++++++ 20 files changed, 1270 insertions(+), 19 deletions(-) create mode 100644 include/test/overlay.h create mode 100644 lib/libfdt/fdt_overlay.c create mode 100644 test/overlay/Kconfig create mode 100644 test/overlay/Makefile create mode 100644 test/overlay/cmd_ut_overlay.c create mode 100644 test/overlay/test-fdt-base.dts create mode 100644 test/overlay/test-fdt-overlay.dts -- 2.9.0

4 37

[U-Boot] [v3] Pull request: u-boot-sh/rmobile
by Nobuhiro Iwamatsu 21 Aug '16

21 Aug '16

Hi Tom, Please pull u-boot-sh rmobile branch. I tested compile in all of arm target. The following changes since commit 59d07ee08e858bf2c121d0cdc6c8ddd3b26ee5b1: SPL: tiny-printf: avoid any BSS usage (2016-07-08 12:50:34 -0400) are available in the git repository at: git://git.denx.de/u-boot-sh.git rmobile for you to fetch changes up to 798dc6be7feabce33676877f85d307f571a9ec15: ARM: rmobile: r8a7795: Add MMU layout (2016-08-17 10:25:36 +0900) ---------------------------------------------------------------- Hiroyuki Yokoyama (1): serial: sh: Add support R8A7795 Nobuhiro Iwamatsu (15): ARM: rmobile: Move SoC sources to mach-rmobile ARM: rmobile: Move SoC headers to mach-rmobile/include/mach ARM: Rmobile: Rename CONFIG_RMOBILE to CONFIG_ARCH_RMOBILE MAINTAINERS: Add maintainer entry of RMOBILE ARM: rmobile: Create R-Car 32bit (Gen1 and Gen2) for Kconfig ARM: rmobile: Move rcar-gen2-common to rcar-common ARM: rmobile: Add support R-Car Generation 3 ARM: rmobile: Add support R8A7795 ARM: rmobile: Add support salvator-x board ARM: rmobile: rcar-common: Fix warning of type difference arm: rmobile: Update defconfig ARM: rmobile: lager: Move rcar-gen2-common to rcar-common ARM: rmobile: Remove duplicate configs by Kconfig in rcar-gen3-common.h ARM: rmobile: salvator-x: Update defconfig ARM: rmobile: r8a7795: Add MMU layout Yannick Gicquel (1): mmc: rmobile: add a compiler barrier masakazu.mochizuki.wd(a)hitachi.com (2): arm: rmobile: Add BLANCHE board support arm: rmobile: Fix HDMI output for BLANCHE board MAINTAINERS | 6 + arch/arm/Kconfig | 7 +- arch/arm/Makefile | 1 + arch/arm/mach-rmobile/Kconfig | 20 + arch/arm/{cpu/armv7/rmobile/Kconfig => mach-rmobile/Kconfig.32} | 12 +- arch/arm/mach-rmobile/Kconfig.64 | 28 + arch/arm/{cpu/armv7/rmobile => mach-rmobile}/Makefile | 4 +- arch/arm/{cpu/armv7/rmobile => mach-rmobile}/board.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info-r8a7740.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info-rcar.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info-sh73a0.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info.c | 1 + arch/arm/{cpu/armv7/rmobile => mach-rmobile}/emac.c | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/ehci-rmobile.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/gpio.h | 6 + arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/irqs.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/mmc.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7740-gpio.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7740.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7790-gpio.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7790.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7791-gpio.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7791.h | 0 arch/arm/mach-rmobile/include/mach/r8a7792-gpio.h | 220 +++++++ arch/arm/mach-rmobile/include/mach/r8a7792.h | 34 + arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7793-gpio.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7793.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7794-gpio.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7794.h | 0 arch/arm/mach-rmobile/include/mach/r8a7795-gpio.h | 988 +++++++++++++++++++++++++++++ arch/arm/mach-rmobile/include/mach/r8a7795.h | 36 ++ arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/rcar-base.h | 387 +++++++++++- arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h | 100 +++ arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/rcar-mstp.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/rmobile.h | 8 +- arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sh73a0-gpio.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sh73a0.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sh_sdhi.h | 0 arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sys_proto.h | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/lowlevel_init.S | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/lowlevel_init_ca15.S | 0 arch/arm/mach-rmobile/lowlevel_init_gen3.S | 76 +++ arch/arm/mach-rmobile/memmap-r8a7795.c | 30 + arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7740.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7790.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7790.h | 48 ++ arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7791.c | 0 arch/arm/mach-rmobile/pfc-r8a7792.c | 2302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7793.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7794.c | 0 arch/arm/mach-rmobile/pfc-r8a7795.c | 4844 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-sh73a0.c | 0 arch/arm/{cpu/armv7/rmobile => mach-rmobile}/timer.c | 0 board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 2 +- board/kmc/kzm9g/kzm9g.c | 2 +- board/renesas/alt/Makefile | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/alt/qos.c | 6 +- board/renesas/blanche/Kconfig | 12 + board/renesas/blanche/Makefile | 9 + board/renesas/blanche/blanche.c | 488 +++++++++++++++ board/renesas/blanche/qos.c | 1366 ++++++++++++++++++++++++++++++++++++++++ board/renesas/blanche/qos.h | 12 + board/renesas/gose/Makefile | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/gose/qos.c | 6 +- board/renesas/koelsch/Makefile | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/koelsch/qos.c | 6 +- board/renesas/lager/Makefile | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/lager/qos.c | 6 +- board/renesas/porter/Makefile | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/porter/qos.c | 6 +- board/renesas/{rcar-gen2-common => rcar-common}/common.c | 14 +- board/renesas/salvator-x/Kconfig | 15 + board/renesas/salvator-x/MAINTAINERS | 6 + board/renesas/salvator-x/Makefile | 9 + board/renesas/salvator-x/salvator-x.c | 120 ++++ board/renesas/silk/Makefile | 2 +- board/renesas/silk/qos.c | 6 +- board/renesas/silk/silk.c | 2 +- board/renesas/stout/Makefile | 2 +- board/renesas/stout/qos.c | 6 +- board/renesas/stout/stout.c | 2 +- configs/alt_defconfig | 20 +- configs/armadillo-800eva_defconfig | 2 +- configs/blanche_defconfig | 22 + configs/gose_defconfig | 21 +- configs/koelsch_defconfig | 20 +- configs/kzm9g_defconfig | 2 +- configs/lager_defconfig | 21 +- configs/porter_defconfig | 21 +- configs/salvator-x_defconfig | 12 + configs/silk_defconfig | 20 +- configs/stout_defconfig | 21 +- drivers/mmc/sh_mmcif.h | 2 +- drivers/mmc/sh_sdhi.c | 29 +- drivers/serial/serial_sh.h | 9 +- include/configs/alt.h | 6 +- include/configs/armadillo-800eva.h | 2 +- include/configs/blanche.h | 121 ++++ include/configs/gose.h | 6 +- include/configs/koelsch.h | 6 +- include/configs/kzm9g.h | 2 +- include/configs/lager.h | 4 +- include/configs/porter.h | 6 +- include/configs/rcar-gen3-common.h | 99 +++ include/configs/salvator-x.h | 54 ++ include/configs/silk.h | 6 +- include/configs/stout.h | 4 +- include/sh_pfc.h | 3 + include/sh_tmu.h | 2 +- 114 files changed, 11605 insertions(+), 221 deletions(-) create mode 100644 arch/arm/mach-rmobile/Kconfig rename arch/arm/{cpu/armv7/rmobile/Kconfig => mach-rmobile/Kconfig.32} (81%) create mode 100644 arch/arm/mach-rmobile/Kconfig.64 rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/Makefile (76%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/board.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info-r8a7740.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info-rcar.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info-sh73a0.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/cpu_info.c (98%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/emac.c (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/ehci-rmobile.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/gpio.h (77%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/irqs.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/mmc.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7740-gpio.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7740.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7790-gpio.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7790.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7791-gpio.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7791.h (100%) create mode 100644 arch/arm/mach-rmobile/include/mach/r8a7792-gpio.h create mode 100644 arch/arm/mach-rmobile/include/mach/r8a7792.h rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7793-gpio.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7793.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7794-gpio.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/r8a7794.h (100%) create mode 100644 arch/arm/mach-rmobile/include/mach/r8a7795-gpio.h create mode 100644 arch/arm/mach-rmobile/include/mach/r8a7795.h rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/rcar-base.h (62%) create mode 100644 arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/rcar-mstp.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/rmobile.h (77%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sh73a0-gpio.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sh73a0.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sh_sdhi.h (100%) rename arch/arm/{include/asm/arch-rmobile => mach-rmobile/include/mach}/sys_proto.h (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/lowlevel_init.S (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/lowlevel_init_ca15.S (100%) create mode 100644 arch/arm/mach-rmobile/lowlevel_init_gen3.S create mode 100644 arch/arm/mach-rmobile/memmap-r8a7795.c rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7740.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7790.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7790.h (63%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7791.c (100%) create mode 100644 arch/arm/mach-rmobile/pfc-r8a7792.c rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7793.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-r8a7794.c (100%) create mode 100644 arch/arm/mach-rmobile/pfc-r8a7795.c rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/pfc-sh73a0.c (100%) rename arch/arm/{cpu/armv7/rmobile => mach-rmobile}/timer.c (100%) create mode 100644 board/renesas/blanche/Kconfig create mode 100644 board/renesas/blanche/Makefile create mode 100644 board/renesas/blanche/blanche.c create mode 100644 board/renesas/blanche/qos.c create mode 100644 board/renesas/blanche/qos.h rename board/renesas/{rcar-gen2-common => rcar-common}/common.c (81%) create mode 100644 board/renesas/salvator-x/Kconfig create mode 100644 board/renesas/salvator-x/MAINTAINERS create mode 100644 board/renesas/salvator-x/Makefile create mode 100644 board/renesas/salvator-x/salvator-x.c create mode 100644 configs/blanche_defconfig create mode 100644 configs/salvator-x_defconfig create mode 100755 include/configs/blanche.h create mode 100644 include/configs/rcar-gen3-common.h create mode 100644 include/configs/salvator-x.h -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

2 1

[U-Boot] [PATCH] tools: moveconfig: add Xtensa GCC prefix to CROSS_COMPILE list
by Masahiro Yamada 21 Aug '16

21 Aug '16

This is needed to move CONFIG options for the recently-added xtfpga_defconfig. The tarball of the pre-built toolchain can be downloaded from: https://www.kernel.org/pub/tools/crosstool/files/bin/x86_64/4.9.0/ Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- tools/moveconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index e7b245c..4b02c53 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -203,6 +203,7 @@ CROSS_COMPILE = { 'powerpc': 'powerpc-linux-', 'sh': 'sh-linux-gnu-', 'sparc': 'sparc-linux-', + 'xtensa': 'xtensa-linux-', 'x86': 'i386-linux-' } -- 1.9.1

1 0

[U-Boot] [PATCH 1/2] ARM: tegra: fix Tegra186 I2C clock name
by Stephen Warren 21 Aug '16

21 Aug '16

From: Stephen Warren <swarren(a)nvidia.com> The Tegra I2C binding dictates that the clock name for the Tegra I2C clock be "div-clk" not "i2c". Fix the Tegra186 DT and I2C driver to honor this. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/dts/tegra186.dtsi | 16 ++++++++-------- drivers/i2c/tegra_i2c.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/dts/tegra186.dtsi b/arch/arm/dts/tegra186.dtsi index d9e7f0351f57..54ef7e3e4adc 100644 --- a/arch/arm/dts/tegra186.dtsi +++ b/arch/arm/dts/tegra186.dtsi @@ -45,7 +45,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C1>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C1>; reset-names = "i2c"; status = "disabled"; @@ -58,7 +58,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C3>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C3>; reset-names = "i2c"; status = "disabled"; @@ -71,7 +71,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C4>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C4>; reset-names = "i2c"; status = "disabled"; @@ -84,7 +84,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C6>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C6>; reset-names = "i2c"; status = "disabled"; @@ -97,7 +97,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C7>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C7>; reset-names = "i2c"; status = "disabled"; @@ -110,7 +110,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C9>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C9>; reset-names = "i2c"; status = "disabled"; @@ -166,7 +166,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C2>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C2>; reset-names = "i2c"; status = "disabled"; @@ -179,7 +179,7 @@ #address-cells = <1>; #size-cells = <0>; clocks = <&bpmp TEGRA186_CLK_I2C8>; - clock-names = "i2c"; + clock-names = "div-clk"; resets = <&bpmp TEGRA186_RESET_I2C8>; reset-names = "i2c"; status = "disabled"; diff --git a/drivers/i2c/tegra_i2c.c b/drivers/i2c/tegra_i2c.c index 31ba263b7295..0dbcc5a1cfea 100644 --- a/drivers/i2c/tegra_i2c.c +++ b/drivers/i2c/tegra_i2c.c @@ -414,7 +414,7 @@ static int tegra_i2c_probe(struct udevice *dev) error("reset_get_by_name() failed: %d\n", ret); return ret; } - ret = clk_get_by_name(dev, "i2c", &i2c_bus->clk); + ret = clk_get_by_name(dev, "div-clk", &i2c_bus->clk); if (ret) { error("clk_get_by_name() failed: %d\n", ret); return ret; -- 2.9.3

2 3

[U-Boot] Squashfs filesystem support
by Frank Hunleth 20 Aug '16

20 Aug '16

Hi, I'm looking for Squashfs support in U-Boot. My web searches have come across talk about it, and at least one old set of patches, but nothing usable. I'm wondering if Squashfs support exists that just hasn't been merged. Or is there not enough interest? In that case, has something superseded it when it comes to read-only, compressed filesystems? Thanks, Frank

1 0

[U-Boot] Error building for qemu-x86 as EFI payload
by Yan Phenix 20 Aug '16

20 Aug '16

Hi, I want to build qemu-x86 as an 32-bit EFI payload. What I have done is below: step 1: make qemu-x86_defconfig step 2: make menuconfig Library routines ---> [*] Support running U-Boot from EFI (X) Support running as an EFI payload (X) Produce a stub for running with 32-bit EFI step 3: make But finally, it fails: lib/efi/efi_stub.o: In function `efi_main': /opt/u-boot-2016.07/obj/../lib/efi/efi_stub.c:357: undefined reference to `_binary_u_boot_dtb_bin_start' /opt/u-boot-2016.07/obj/../lib/efi/efi_stub.c:357: undefined reference to `_binary_u_boot_dtb_bin_end' /opt/u-boot-2016.07/Makefile:1117: recipe for target 'u-boot-payload' failed make[1]: *** [u-boot-payload] Error 1 make[1]: Leaving directory '/opt/u-boot-2016.07/obj' Makefile:150: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Can anybody tell me what mistakes I made? Best Regards! Phenix

1 0