October 2014 - U-Boot

[U-Boot] [PATCH 1/3] sunxi: Add clock_get_pll5p() function
by Hans de Goede 22 Oct '14

22 Oct '14

This is a preparation patch for making the pll5 "p" divisor configurable through Kconfig. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 11 +++++++++++ arch/arm/include/asm/arch-sunxi/clock.h | 1 + arch/arm/include/asm/arch-sunxi/clock_sun4i.h | 3 +++ 3 files changed, 15 insertions(+) diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun4i.c b/arch/arm/cpu/armv7/sunxi/clock_sun4i.c index ecbdb01..4a0d64f 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun4i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun4i.c @@ -180,6 +180,17 @@ void clock_set_pll1(unsigned int hz) } #endif +unsigned int clock_get_pll5p(void) +{ + struct sunxi_ccm_reg *const ccm = + (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; + uint32_t rval = readl(&ccm->pll5_cfg); + int n = ((rval & CCM_PLL5_CTRL_N_MASK) >> CCM_PLL5_CTRL_N_SHIFT); + int k = ((rval & CCM_PLL5_CTRL_K_MASK) >> CCM_PLL5_CTRL_K_SHIFT) + 1; + int p = ((rval & CCM_PLL5_CTRL_P_MASK) >> CCM_PLL5_CTRL_P_SHIFT); + return (24000000 * n * k) >> p; +} + unsigned int clock_get_pll6(void) { struct sunxi_ccm_reg *const ccm = diff --git a/arch/arm/include/asm/arch-sunxi/clock.h b/arch/arm/include/asm/arch-sunxi/clock.h index 8f5d860..9775c85 100644 --- a/arch/arm/include/asm/arch-sunxi/clock.h +++ b/arch/arm/include/asm/arch-sunxi/clock.h @@ -25,6 +25,7 @@ int clock_init(void); int clock_twi_onoff(int port, int state); void clock_set_pll1(unsigned int hz); +unsigned int clock_get_pll5p(void); unsigned int clock_get_pll6(void); void clock_init_safe(void); void clock_init_uart(void); diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h index 1ba997a..90af8e2 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun4i.h @@ -199,13 +199,16 @@ struct sunxi_ccm_reg { #define CCM_PLL5_CTRL_M1_MASK CCM_PLL5_CTRL_M1(0x3) #define CCM_PLL5_CTRL_M1_X(n) ((n) - 1) #define CCM_PLL5_CTRL_K(n) (((n) & 0x3) << 4) +#define CCM_PLL5_CTRL_K_SHIFT 4 #define CCM_PLL5_CTRL_K_MASK CCM_PLL5_CTRL_K(0x3) #define CCM_PLL5_CTRL_K_X(n) ((n) - 1) #define CCM_PLL5_CTRL_LDO (0x1 << 7) #define CCM_PLL5_CTRL_N(n) (((n) & 0x1f) << 8) +#define CCM_PLL5_CTRL_N_SHIFT 8 #define CCM_PLL5_CTRL_N_MASK CCM_PLL5_CTRL_N(0x1f) #define CCM_PLL5_CTRL_N_X(n) (n) #define CCM_PLL5_CTRL_P(n) (((n) & 0x3) << 16) +#define CCM_PLL5_CTRL_P_SHIFT 16 #define CCM_PLL5_CTRL_P_MASK CCM_PLL5_CTRL_P(0x3) #define CCM_PLL5_CTRL_P_X(n) ((n) - 1) #define CCM_PLL5_CTRL_BW (0x1 << 18) -- 2.1.0

3 6

[U-Boot] [PATCH] net: asix: Add support for AX88772B
by Alexandre Courbot 22 Oct '14

22 Oct '14

This USB device works as-is on this driver. Signed-off-by: Alexandre Courbot <acourbot(a)nvidia.com> --- drivers/usb/eth/asix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/eth/asix.c b/drivers/usb/eth/asix.c index 6557055e02b8..11811094ede8 100644 --- a/drivers/usb/eth/asix.c +++ b/drivers/usb/eth/asix.c @@ -580,6 +580,7 @@ static const struct asix_dongle asix_dongles[] = { { 0x2001, 0x3c05, FLAG_TYPE_AX88772 }, /* ASIX 88772B */ { 0x0b95, 0x772b, FLAG_TYPE_AX88772B | FLAG_EEPROM_MAC }, + { 0x0b95, 0x7e2b, FLAG_TYPE_AX88772B }, { 0x0000, 0x0000, FLAG_NONE } /* END - Do not remove */ }; -- 2.1.2

3 4

[U-Boot] [PATCH] arm: socfpga: Move code from misc_init_r() to arch_early_init_r()
by Marek Vasut 22 Oct '14

22 Oct '14

Move this initialization code to proper place. The misc_init_r() function is called way too late and the platform initialization code should be executed much earlier. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)altera.com> Cc: Vince Bridgers <vbridger(a)altera.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Pavel Machek <pavel(a)denx.de> --- arch/arm/cpu/armv7/socfpga/misc.c | 2 +- include/configs/socfpga_common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 8c26589..9b388b4 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/cpu/armv7/socfpga/misc.c @@ -176,7 +176,7 @@ static void socfpga_nic301_slave_ns(void) static uint32_t iswgrp_handoff[8]; -int misc_init_r(void) +int arch_early_init_r(void) { int i; for (i = 0; i < 8; i++) /* Cache initial SW setting regs */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 3b82925..1fdc043 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -22,7 +22,7 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_MISC_INIT_R +#define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_SYS_NO_FLASH #define CONFIG_CLOCKS -- 2.1.1

2 2

[U-Boot] [PATCH] arm: socfpga: Zap spl.h and ad-hoc related syms
by Marek Vasut 22 Oct '14

22 Oct '14

Switch to the common spl.h file and zap the arch/spl.h . Since the arch/spl.h contained various ad-hoc symbols, zap those symbols as well and rework the board configuration a little so it doesn't depend on them. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)altera.com> Cc: Vince Bridgers <vbridger(a)altera.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Pavel Machek <pavel(a)denx.de> --- arch/arm/cpu/armv7/socfpga/u-boot-spl.lds | 9 --------- arch/arm/include/asm/arch-socfpga/spl.h | 15 --------------- arch/arm/include/asm/spl.h | 2 +- include/configs/socfpga_common.h | 17 +++++++++++------ 4 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 arch/arm/include/asm/arch-socfpga/spl.h diff --git a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds index db9bdad..569fa41 100644 --- a/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds +++ b/arch/arm/cpu/armv7/socfpga/u-boot-spl.lds @@ -42,13 +42,4 @@ SECTIONS . = ALIGN(4); __bss_end = .; } >.sdram - - . = ALIGN(8); - __malloc_start = .; - . = . + CONFIG_SPL_MALLOC_SIZE; - __malloc_end = .; - - . = . + CONFIG_SPL_STACK_SIZE; - . = ALIGN(8); - __stack_start = .; } diff --git a/arch/arm/include/asm/arch-socfpga/spl.h b/arch/arm/include/asm/arch-socfpga/spl.h deleted file mode 100644 index 7e310d5..0000000 --- a/arch/arm/include/asm/arch-socfpga/spl.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) 2012 Pavel Machek <pavel(a)denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _SOCFPGA_SPL_H_ -#define _SOCFPGA_SPL_H_ - -/* Symbols from linker script */ -extern char __malloc_start, __malloc_end, __stack_start; - -#define BOOT_DEVICE_RAM 1 - -#endif diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h index e5daf89..8acd7cd 100644 --- a/arch/arm/include/asm/spl.h +++ b/arch/arm/include/asm/spl.h @@ -7,7 +7,7 @@ #ifndef _ASM_SPL_H_ #define _ASM_SPL_H_ -#if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) \ +#if defined(CONFIG_OMAP) \ || defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \ || defined(CONFIG_EXYNOS4210) /* Platform-specific defines */ diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 49504dc..88f46ce 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -167,16 +167,21 @@ /* * SPL + * + * SRAM Memory layout: + * + * 0xFFFF_0000 ...... Start of SRAM + * 0xFFFF_xxxx ...... Top of stack (grows down) + * 0xFFFF_yyyy ...... Malloc area + * 0xFFFF_zzzz ...... Global Data + * 0xFFFF_FF00 ...... End of SRAM */ #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_BOARD_INIT #define CONFIG_SPL_RAM_DEVICE -#define CONFIG_SPL_TEXT_BASE 0xFFFF0000 -#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR -#define CONFIG_SPL_STACK_SIZE (4 * 1024) -#define CONFIG_SPL_MALLOC_SIZE (5 * 1024) /* FIXME */ -#define CONFIG_SYS_SPL_MALLOC_START ((unsigned long) (&__malloc_start)) -#define CONFIG_SYS_SPL_MALLOC_SIZE (&__malloc_end - &__malloc_start) +#define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR +#define CONFIG_SYS_SPL_MALLOC_START CONFIG_SYS_INIT_SP_ADDR +#define CONFIG_SYS_SPL_MALLOC_SIZE (5 * 1024) #define CHUNKSZ_CRC32 (1 * 1024) /* FIXME: ewww */ #define CONFIG_CRC32_VERIFY -- 2.1.1

2 2

[U-Boot] [PATCH v2 0/8] ARM: sunxi: Add Allwinner A23 (sun8i) support
by Chen-Yu Tsai 22 Oct '14

22 Oct '14

Hi everyone, This series adds support for Allwinner's A23 SoC. All the patches are either direct cherry-picks or changes manually merged from u-boot-sunxi. Patch 1 adds uart0 pinmux values for A23. Patch 2 adds support for using uart0 on port F, either using a breakout board or soldering wires to exposed pads. At least one version of A23 tablets requires this, as no other uarts are exposed. Patch 3 adds support for sun8i in the mmc driver. This is the same as sun6i. Patch 4 adds machine support for sun8i. Patch 5 adds support for gpio banks L and beyond, which is used by r_uart, p2wi (on sun6i) and rsb (on sun8i). Patch 6 makes the prcm apb0 clock enabling function to take an argument for which modules should be enabled. Patch 7 adds support for using r_uart as a console (with CONS_INDEX=5). Patch 8 adds a defconfig for the Ippo Q8H A23 tablet board. Changes since v1: - Dropped "ARM: sunxi: Fix build break when CONFIG_MMC is not defined" (already merged) - Add clarifying comment about SUNXI_GPIO_BANKS macro - Correct R_PIO L pin bank starting offset - Check for R_PIO pins by matching against L pin bank start pin number Cheers ChenYu Chen-Yu Tsai (7): ARM: sunxi: Add sun8i (A23) UART0 pin mux support ARM: sunxi: Add support for uart0 on port F (mmc0) mmc: sunxi: Add support for sun8i (A23) ARM: sunxi: Add basic A23 support ARM: sunxi: Allow specifying module in prcm apb0 init function ARM: sunxi: Add support for using R_UART as console ARM: sunxi: Add Ippo-q8h-v5 A23 tablet board defconfig Hans de Goede (1): ARM: sunxi: Add support for R_PIO gpio banks arch/arm/Kconfig | 3 +++ arch/arm/cpu/armv7/sunxi/Makefile | 2 ++ arch/arm/cpu/armv7/sunxi/board.c | 18 +++++++++++++-- arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 6 +++++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 2 ++ arch/arm/cpu/armv7/sunxi/prcm.c | 12 +++++----- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 1 + arch/arm/include/asm/arch-sunxi/gpio.h | 40 +++++++++++++++++++++++++++++++-- arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm.h | 2 +- board/sunxi/Kconfig | 3 ++- board/sunxi/MAINTAINERS | 5 +++++ configs/Ippo_q8h_defconfig | 4 ++++ drivers/mmc/sunxi_mmc.c | 2 +- include/configs/sun8i.h | 23 +++++++++++++++++++ include/configs/sunxi-common.h | 3 +++ 17 files changed, 116 insertions(+), 14 deletions(-) create mode 100644 configs/Ippo_q8h_defconfig create mode 100644 include/configs/sun8i.h -- 2.1.1

2 9

[U-Boot] [PATCH] imximage: Fix the bootdata.size calculation
by Ye.Li 22 Oct '14

22 Oct '14

The bootdata.size should contain the IVT offset part, but the calculation in imximage tool does not have. This will cause some data at the end of image not be loaded into memory. Signed-off-by: Ye.Li <B37916(a)freescale.com> --- tools/imximage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/imximage.c b/tools/imximage.c index faba238..526b7d4 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -587,7 +587,7 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd, * * The remaining fraction of a block bytes would not be loaded! */ - *header_size_ptr = ROUND(sbuf->st_size, 4096); + *header_size_ptr = ROUND((sbuf->st_size + imximage_ivt_offset), 4096); if (csf_ptr && imximage_csf_size) { *csf_ptr = params->ep - imximage_init_loadsize + -- 1.7.4.1

4 5

[U-Boot] Please pull u-boot-x88
by Simon Glass 22 Oct '14

22 Oct '14

Hi Tom, These changes come before driver model. I'll have at least one more x86 pull request after more driver model stuff is applied. The following changes since commit a84c8107d9b050fe8a31220d28588abfc2d99aee: Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq (2014-10-20 18:17:26 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to 35d4fed320d577a4446531d7b9350ce40065c4b0: x86: Fix GDT limit in start16.S (2014-10-22 09:03:07 -0600) ---------------------------------------------------------------- Bin Meng (2): x86: Fix rom version build with CONFIG_X86_RESET_VECTOR x86: Fix GDT limit in start16.S Simon Glass (6): x86: Enable LMB and RAMDISK_HIGH by default x86: Rewrite bootm.c to make it similar to ARM x86: Allow cmdline setup in setup_zimage() to be optional sandbox: bootm: Don't fail the architecture check doc: Tidy up and update part of the FIT documentation x86: Support loading kernel setup from a FIT arch/x86/cpu/Makefile | 4 +- arch/x86/cpu/start16.S | 2 +- arch/x86/include/asm/bootm.h | 12 +++ arch/x86/include/asm/config.h | 3 + arch/x86/lib/bootm.c | 151 +++++++++++++++++++++++++++-------- arch/x86/lib/zimage.c | 41 ++++------ common/bootm.c | 23 +++++- common/cmd_bootm.c | 1 + common/image-fit.c | 24 +++++- common/image.c | 11 +++ doc/uImage.FIT/kernel.its | 50 ++++++++++++ doc/uImage.FIT/source_file_format.txt | 19 +++-- doc/uImage.FIT/x86-fit-boot.txt | 276 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/bootstage.h | 3 + include/image.h | 13 +++ 15 files changed, 557 insertions(+), 76 deletions(-) create mode 100644 arch/x86/include/asm/bootm.h create mode 100644 doc/uImage.FIT/x86-fit-boot.txt Regards, Simon

2 1

[U-Boot] [PATCH v2 2/2] x86: Fix GDT limit in start16.S
by Bin Meng 22 Oct '14

22 Oct '14

GDT limit should be one less than an integral multiple of eight. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/cpu/start16.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 8b9b327..6968fda 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -70,7 +70,7 @@ idt_ptr: * GDT is setup in a safe location in RAM */ gdt_ptr: - .word 0x20 /* limit (32 bytes = 4 GDT entries) */ + .word 0x1f /* limit (31 bytes = 4 GDT entries - 1) */ .long BOOT_SEG + gdt /* base */ /* Some CPUs are picky about GDT alignment... */ -- 1.8.2.1

2 2

[U-Boot] [PATCH v2 1/2] x86: Fix rom version build with CONFIG_X86_RESET_VECTOR
by Bin Meng 22 Oct '14

22 Oct '14

When building U-Boot with CONFIG_X86_RESET_VECTOR, the linking process misses the resetvec.o and start16.o so it cannot generate the rom version of U-Boot. The arch/x86/cpu/Makefile is updated to pull them into the final linking process. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/x86/cpu/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 415bc24..e7bb3e3 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -9,5 +9,5 @@ # extra-y = start.o -extra-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o -obj-y = interrupts.o cpu.o +obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o +obj-y += interrupts.o cpu.o -- 1.8.2.1

2 2

[U-Boot] [PATCH v3 0/6] x86: Enable FIT images on x86
by Simon Glass 22 Oct '14

22 Oct '14

This little series adds support for booting FITs on x86. A FIT is a single file that can contain a kernel, device tree and ramdisk. x86 kernels require a setup.bin file to boot. Rather than try to pack this into the image in a clever way, this series just adds it as another image in the FIT. At present compression is not supported for the setup binary. The kernel image can be compressed using FIT's normal compression options, such as bzip2 and lzo. U-Boot will decompress it as part of the 'bootm' command. More work is needed to make this implementation also support a zImage (which contains a setup.bin and a compressed kernel in a single image) in the FIT. The full series is available at: http://git.denx.de/u-boot-x86.git in branch 'working'. Changes in v3: - Move sandbox bootm change into a separate patch - Split out FIT documentation fixes into a separate patch - Rebase to master - Word-wrap the new documentation file Changes in v2: - Correct setup of setup.bin file - Move license header to SPDX - Add a README to explain how to use this feature - Correct addresses in kernel.its example file Simon Glass (6): x86: Enable LMB and RAMDISK_HIGH by default x86: Rewrite bootm.c to make it similar to ARM x86: Allow cmdline setup in setup_zimage() to be optional sandbox: bootm: Don't fail the architecture check doc: Tidy up and update part of the FIT documentation x86: Support loading kernel setup from a FIT arch/x86/include/asm/bootm.h | 12 ++ arch/x86/include/asm/config.h | 3 + arch/x86/lib/bootm.c | 151 ++++++++++++++----- arch/x86/lib/zimage.c | 41 ++--- common/bootm.c | 23 ++- common/cmd_bootm.c | 1 + common/image-fit.c | 24 ++- common/image.c | 11 ++ doc/uImage.FIT/kernel.its | 50 ++++++ doc/uImage.FIT/source_file_format.txt | 19 ++- doc/uImage.FIT/x86-fit-boot.txt | 276 ++++++++++++++++++++++++++++++++++ include/bootstage.h | 3 + include/image.h | 13 ++ 13 files changed, 554 insertions(+), 73 deletions(-) create mode 100644 arch/x86/include/asm/bootm.h create mode 100644 doc/uImage.FIT/x86-fit-boot.txt -- 2.1.0.rc2.206.gedb03e5

1 12