November 2012 - U-Boot

[U-Boot] [PATCH v6 1/7] powerpc: Extract EPAPR_MAGIC constants into processor.h
by Stefan Roese 07 Nov '12

07 Nov '12

By extracting these defines into a header, they can be re-used by other C sources as well. This will be done by the SPL framework OS boot support. Signed-off-by: Stefan Roese <sr(a)denx.de> --- Changes in v6: - Fix compile warning: release.S:354:0: warning: "EPAPR_MAGIC" redefined arch/powerpc/cpu/mpc85xx/release.S | 1 - arch/powerpc/include/asm/processor.h | 6 ++++++ arch/powerpc/lib/bootm.c | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/release.S b/arch/powerpc/cpu/mpc85xx/release.S index 4ba44a9..d2e94b8 100644 --- a/arch/powerpc/cpu/mpc85xx/release.S +++ b/arch/powerpc/cpu/mpc85xx/release.S @@ -351,7 +351,6 @@ __secondary_reset_vector: .align L1_CACHE_SHIFT .global __second_half_boot_page __second_half_boot_page: -#define EPAPR_MAGIC 0x45504150 #define ENTRY_ADDR_UPPER 0 #define ENTRY_ADDR_LOWER 4 #define ENTRY_R3_UPPER 8 diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 7aa3231..19fe250 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -1342,4 +1342,10 @@ void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); #endif #endif /* CONFIG_MACH_SPECIFIC */ +#if defined(CONFIG_MPC85xx) || defined(CONFIG_440) + #define EPAPR_MAGIC (0x45504150) +#else + #define EPAPR_MAGIC (0x65504150) +#endif + #endif /* __ASM_PPC_PROCESSOR_H */ diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 53dc4df..e3fee0b 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -87,12 +87,6 @@ static void boot_jump_linux(bootm_headers_t *images) * r8: 0 * r9: 0 */ -#if defined(CONFIG_MPC85xx) || defined(CONFIG_440) - #define EPAPR_MAGIC (0x45504150) -#else - #define EPAPR_MAGIC (0x65504150) -#endif - debug (" Booting using OF flat tree...\n"); WATCHDOG_RESET (); (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC, -- 1.8.0

5 7

[U-Boot] [PATCH v5 0/7] SPL: Port SPL framework to powerpc
by Stefan Roese 07 Nov '12

07 Nov '12

This patchset ports the SPL framework to powerpc. Its based on the SPL generalization lately done by Tom Rini. The patches is based on the current "master" branch. Additionally, a new MPC5200 board port is included, the a3m071 board port. This board port uses this SPL framework mainly to speed up booting into the OS (Linux of course). Detection of Linux vs. U-Boot booting is done here by checking the environment variable "boot_os". If "boot_os" is set to "yes", then the OS (Linux) is booted. Otherwise the "real" U-Boot is booted. Tom, what do you think? I would really like to get this included now. Would you prefer if I would push this patch series into a git repo where you could pull from? Thanks, Stefan Changes in v5: - Remove timer_init() for PPC systems - Remove some unneeded defines from a3m071.h (e.g. LIME related) - Configure PCS2 not for SPI as default Changes in v4: - Build spl.o only for SPL image - getenv_f not extracted into separate file. Only Makefile additions for SPL_BUILD needed. - Add remark to call "fdt chosen" to board/a3m071/README - Configure PCS2 as CODEC2 (SPI) - Drop patch fdt: cmd_fdt: Call fdt_chosen() from "fdt boardsetup" Changes in v3: - Rebased on current master plus SPL framework v7 - Don't use special MPC5xxx memcpy in SPL - Move linker symbols to header spl.h (checkpatch) Changes in v2: - Rebased on Tom's SPL framework patches v4 - Add option to skip copying of the mkimage header - Rebased on Tom's SPL framework patches v4 - Rebased on Tom's SPL framework patches v4 - a3m071 build: Concat SPL binary and u-boot.img directly (no padding) Stefan Roese (7): powerpc: Extract EPAPR_MAGIC constants into processor.h SPL: Port SPL framework to powerpc env: Enable getenv_f() for SPL_BUILD mpc5200: Add SPL support mpc5200: Add a3m071 board support Makefile: Add possibility to set entry-point for u-boot.img Makefile: Add target for combined spl/u-boot.bin & u-boot.img MAINTAINERS | 2 + Makefile | 14 +- arch/powerpc/cpu/mpc5xxx/Makefile | 4 + arch/powerpc/cpu/mpc5xxx/spl_boot.c | 79 +++++++ arch/powerpc/cpu/mpc5xxx/start.S | 22 ++ arch/powerpc/cpu/mpc5xxx/u-boot-spl.lds | 57 +++++ arch/powerpc/include/asm/processor.h | 6 + arch/powerpc/include/asm/spl.h | 31 +++ arch/powerpc/lib/Makefile | 14 ++ arch/powerpc/lib/bootm.c | 6 - arch/powerpc/lib/spl.c | 42 ++++ board/a3m071/Makefile | 36 +++ board/a3m071/README | 80 +++++++ board/a3m071/a3m071.c | 335 ++++++++++++++++++++++++++++ board/a3m071/mt46v16m16-75.h | 32 +++ boards.cfg | 1 + common/Makefile | 3 + common/spl/spl.c | 16 ++ include/configs/a3m071.h | 380 ++++++++++++++++++++++++++++++++ 19 files changed, 1153 insertions(+), 7 deletions(-) create mode 100644 arch/powerpc/cpu/mpc5xxx/spl_boot.c create mode 100644 arch/powerpc/cpu/mpc5xxx/u-boot-spl.lds create mode 100644 arch/powerpc/include/asm/spl.h create mode 100644 arch/powerpc/lib/spl.c create mode 100644 board/a3m071/Makefile create mode 100644 board/a3m071/README create mode 100644 board/a3m071/a3m071.c create mode 100644 board/a3m071/mt46v16m16-75.h create mode 100644 include/configs/a3m071.h -- 1.8.0

3 11

[U-Boot] [PATCH 0/8 v2] Add TMU support for Exynos5250 based SMDK5250
by Hatim Ali 07 Nov '12

07 Nov '12

This patch series adds support for TMU driver using device tree for Exynos5250 based SMDK5250 board. This patch series is dependent on the patch series "Add DT based ethernet driver for SMDK5250" by Hatim Ali Changes since v1: - Created new generic header file include/tmu.h - Removed GEN tag from subject in 2 patches - Changed description comments for couple of functions - Added "Acked-by" to all the patches Akshay Saraswat (6): EXYNOS5: FDT: Add TMU device node values EXYNOS5: TMU: Add driver for Thermal Management Unit EXYNOS5: Power down API for Thermal Management Unit Add a poll function to monitor events EXYNOS5: TMU: Add TMU status polling EXYNOS5: Config: Enable support for Exynos TMU driver Alim Akhtar (2): TMU: Add u-boot command to read current temp EXYNOS5: Config: Enable tmu command README | 7 + arch/arm/cpu/armv7/exynos/power.c | 15 ++ arch/arm/dts/exynos5250.dtsi | 5 + arch/arm/include/asm/arch-exynos/exynos-tmu.h | 58 +++++ arch/arm/include/asm/arch-exynos/power.h | 8 + board/samsung/dts/exynos5250-smdk5250.dts | 13 + board/samsung/smdk5250/smdk5250.c | 36 +++ common/Makefile | 1 + common/cmd_tmu.c | 51 +++++ common/console.c | 5 + doc/device-tree-bindings/exynos/tmu.txt | 35 +++ drivers/power/Makefile | 1 + drivers/power/exynos-tmu.c | 297 +++++++++++++++++++++++++ include/common.h | 6 + include/configs/exynos5250-dt.h | 7 + include/fdtdec.h | 1 + include/tmu.h | 46 ++++ lib/fdtdec.c | 1 + 18 files changed, 593 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-exynos/exynos-tmu.h create mode 100644 common/cmd_tmu.c create mode 100644 doc/device-tree-bindings/exynos/tmu.txt create mode 100644 drivers/power/exynos-tmu.c create mode 100644 include/tmu.h -- 1.7.2.3

2 11

[U-Boot] [PATCH] tegra: add CONSOLE_MUX support to tegra-kbc
by Allen Martin 07 Nov '12

07 Nov '12

Add support for CONSOLE_MUX to tegra-kbc driver. This requires adding a flag to struct keyb to know the driver has already been initialized so if we try to initialize it again we can just return success. Also call into iomux_doenv() from drv_keyboard_init to re-evaluate the stdin string. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- drivers/input/tegra-kbc.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/input/tegra-kbc.c b/drivers/input/tegra-kbc.c index ab7a9e3..88471d3 100644 --- a/drivers/input/tegra-kbc.c +++ b/drivers/input/tegra-kbc.c @@ -63,6 +63,7 @@ static struct keyb { struct kbc_tegra *kbc; /* tegra keyboard controller */ unsigned char inited; /* 1 if keyboard has been inited */ unsigned char first_scan; /* 1 if this is our first key scan */ + unsigned char created; /* 1 if driver has been created */ /* * After init we must wait a short time before polling the keyboard. @@ -306,6 +307,10 @@ static void tegra_kbc_open(void) */ static int init_tegra_keyboard(void) { + /* check if already created */ + if (config.created) + return 0; + #ifdef CONFIG_OF_CONTROL int node; @@ -349,6 +354,7 @@ static int init_tegra_keyboard(void) config_kbc_gpio(config.kbc); tegra_kbc_open(); + config.created = 1; debug("%s: Tegra keyboard ready\n", __func__); return 0; @@ -357,6 +363,8 @@ static int init_tegra_keyboard(void) int drv_keyboard_init(void) { struct stdio_dev dev; + char *stdinname = getenv("stdin"); + int error; if (input_init(&config.input, 0)) { debug("%s: Cannot set up input\n", __func__); @@ -372,5 +380,13 @@ int drv_keyboard_init(void) dev.start = init_tegra_keyboard; /* Register the device. init_tegra_keyboard() will be called soon */ - return input_stdio_register(&dev); + error = input_stdio_register(&dev); + if (error) + return error; +#ifdef CONFIG_CONSOLE_MUX + error = iomux_doenv(stdin, stdinname); + if (error) + return error; +#endif + return 0; } -- 1.7.10.4

3 2

[U-Boot] SMSC LAN9514 on TI DM37x board
by Felix Radensky 07 Nov '12

07 Nov '12

Hi, I'm running u-boot-2012.10 on a custom DM37x based board. The board has LAN9514 USB Ethernet adapter connected in EHCI host controller via USB3320 ULPI PHY. This is very similar to BeagleBoard XM. Both Ethernet and USB hub work in linux-2.6.37 from TI PSP 04.02.00.07. In u-boot however, neither Ethernet nor mass storage devices attached to hub are not detected. Below is boot log: U-Boot 2012.10 (Nov 02 2012 - 00:44:41) OMAP36XX/37XX-GP ES1.2, CPU-OPP2, L3-165MHz, Max CPU Clock 1 Ghz Pro4Tech MVC404 board + LPDDR/NAND I2C: ready DRAM: 256 MiB NAND: 512 MiB MMC: OMAP SD/MMC: 0 In: serial Out: serial Err: serial Net: Net Initialization Skipped No ethernet found. Hit any key to stop autoboot: 0 MVC404 > usb start (Re)start USB... USB: Register 1313 NbrPorts 3 USB EHCI 1.00 scanning bus for devices... 1 USB Device(s) found scanning bus for storage devices... 0 Storage Device(s) found scanning bus for ethernet devices... 0 Ethernet Device(s) found MVC404 > usb info 1: Hub, USB Revision 2.0 - u-boot EHCI Host Controller - Class: Hub - PacketSize: 64 Configurations: 1 - Vendor: 0x0000 Product 0x0000 Version 1.0 Configuration: 1 - Interfaces: 1 Self Powered 0mA Interface: 0 - Alternate Setting 0, Endpoints: 1 - Class Hub - Endpoint 1 In Interrupt MaxPacket 8 Interval 255ms I have the following definitions in the code: #define CONFIG_USB_OMAP3 #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 24 #define CONFIG_USB_ULPI #define CONFIG_USB_ULPI_VIEWPORT_OMAP #define CONFIG_USB_STORAGE static struct omap_usbhs_board_data usbhs_bdata = { .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED }; MUX_VAL(CP(ETK_D15_ES2), (IDIS | PTD | DIS | M4)) /*GPIO_24*/ I'd appreciate any help in fixing the problem. Thanks. Felix Radensky.

3 5

[U-Boot] [PATCH 1/3] tpm: Add casts for proper compilation
by Simon Glass 07 Nov '12

07 Nov '12

From: Taylor Hutt <thutt(a)chromium.org> When building for the Sandbox version, the casts in this change are necessary to avoid compilation issues. Signed-off-by: Taylor Hutt <thutt(a)chromium.org> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/tpm/generic_lpc_tpm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/tpm/generic_lpc_tpm.c b/drivers/tpm/generic_lpc_tpm.c index 6c494eb..04ad418 100644 --- a/drivers/tpm/generic_lpc_tpm.c +++ b/drivers/tpm/generic_lpc_tpm.c @@ -135,7 +135,7 @@ static u8 tpm_read_byte(const u8 *ptr) { u8 ret = readb(ptr); debug(PREFIX "Read reg 0x%4.4x returns 0x%2.2x\n", - (u32)ptr - (u32)lpc_tpm_dev, ret); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, ret); return ret; } @@ -143,21 +143,21 @@ static u32 tpm_read_word(const u32 *ptr) { u32 ret = readl(ptr); debug(PREFIX "Read reg 0x%4.4x returns 0x%8.8x\n", - (u32)ptr - (u32)lpc_tpm_dev, ret); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, ret); return ret; } static void tpm_write_byte(u8 value, u8 *ptr) { debug(PREFIX "Write reg 0x%4.4x with 0x%2.2x\n", - (u32)ptr - (u32)lpc_tpm_dev, value); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, value); writeb(value, ptr); } static void tpm_write_word(u32 value, u32 *ptr) { debug(PREFIX "Write reg 0x%4.4x with 0x%8.8x\n", - (u32)ptr - (u32)lpc_tpm_dev, value); + (u32)(uintptr_t)ptr - (u32)(uintptr_t)lpc_tpm_dev, value); writel(value, ptr); } @@ -491,5 +491,5 @@ int tis_sendrecv(const u8 *sendbuf, size_t send_size, return TPM_DRIVER_ERR; } - return tis_readresponse(recvbuf, recv_len); + return tis_readresponse(recvbuf, (u32 *)recv_len); } -- 1.7.7.3

2 10

[U-Boot] [PATCH 1/7] ide: Add printf format string for CONFIG_SYS_64BIT_LBA option
by Simon Glass 07 Nov '12

07 Nov '12

From: Gabe Black <gabeblack(a)chromium.org> The size of an LBA type changes depending on this option. We need to use a different printf() string in each case, so create a define for this. Signed-off-by: Gabe Black <gabeblack(a)chromium.org> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/ide.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/ide.h b/include/ide.h index 385e909..18d63b2 100644 --- a/include/ide.h +++ b/include/ide.h @@ -42,8 +42,10 @@ #ifdef CONFIG_SYS_64BIT_LBA typedef uint64_t lbaint_t; +#define LBAF "%llx" #else typedef ulong lbaint_t; +#define LBAF "%lx" #endif /* -- 1.7.7.3

6 30

[U-Boot] [PATCH v2] microblaze: Fix compilation failure because of missing libdts
by Michal Simek 07 Nov '12

07 Nov '12

Microblaze platform can use CONFIG_OF_EMBED option but also it is necessary to support boards which don't want to use this option. U-Boot doesn't compile dts/libdts.o for #undef CONFIG_OF_EMBED case that's why it should be guarded by ifdef. Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- v2: Change commit message --- arch/microblaze/cpu/u-boot.lds | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/microblaze/cpu/u-boot.lds b/arch/microblaze/cpu/u-boot.lds index 4297b93..fe3d97d 100644 --- a/arch/microblaze/cpu/u-boot.lds +++ b/arch/microblaze/cpu/u-boot.lds @@ -45,7 +45,9 @@ SECTIONS .data ALIGN(0x4): { __data_start = .; +#ifdef CONFIG_OF_EMBED dts/libdts.o (.data) +#endif *(.data) __data_end = .; } -- 1.7.0.4

1 0

[U-Boot] OMAP4/Panda: u-boot upgrade v2012.04.01 -> v2012.10 breaks RTC wakeups
by Kevin Hilman 07 Nov '12

07 Nov '12

Hello, I just noticed that the kernel wakeup from suspend using RTC is broken after I upgraded u-boot from v2012.04.01 to v2012.10 on my OMAP4430/Panda and OMAP4460/Panda-ES. I haven't isolated the cause yet, but am hoping someone might have a pointer about where to start digging. Kevin

3 3

[U-Boot] [PATCH] microblaze: Remove asm/bitops.h from asm/posix_types.h
by Michal Simek 07 Nov '12

07 Nov '12

The patch "include/linux/byteorder: import latest endian definitions from linux" (sha1: eef1cf2d5cf1cae5fb76713e912263dedf110aeb) Introduced a lot of compilation failures with unknow types. include/linux/byteorder/big_endian.h:45:1: error: unknown type name '__le64' include/linux/byteorder/big_endian.h: In function '__cpu_to_le64p': include/linux/byteorder/big_endian.h:47:18: error: '__le64' undeclared (first use in this function) include/linux/byteorder/big_endian.h:47:18: note: each undeclared identifier is reported only once for each function it appears in include/linux/byteorder/big_endian.h:47:25: error: expected ';' before '__swab64p' include/linux/byteorder/big_endian.h: At top level: include/linux/byteorder/big_endian.h:49:1: error: unknown type name '__le64' include/linux/byteorder/big_endian.h:53:1: error: unknown type name '__le32' include/linux/byteorder/big_endian.h: In function '__cpu_to_le32p': include/linux/byteorder/big_endian.h:55:18: error: '__le32' undeclared (first use in this function) include/linux/byteorder/big_endian.h:55:25: error: expected ';' before '__swab32p' include/linux/byteorder/big_endian.h: At top level: include/linux/byteorder/big_endian.h:57:1: error: unknown type name '__le32' include/linux/byteorder/big_endian.h:61:1: error: unknown type name '__le16' ... Removing asm/bitops.h solved this problem. Signed-off-by: Michal Simek <monstr(a)monstr.eu> --- arch/microblaze/include/asm/posix_types.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/arch/microblaze/include/asm/posix_types.h b/arch/microblaze/include/asm/posix_types.h index 9a2cc66..38dc5aa 100644 --- a/arch/microblaze/include/asm/posix_types.h +++ b/arch/microblaze/include/asm/posix_types.h @@ -16,9 +16,6 @@ #ifndef __MICROBLAZE_POSIX_TYPES_H__ #define __MICROBLAZE_POSIX_TYPES_H__ -#include <asm/bitops.h> - - typedef unsigned int __kernel_dev_t; typedef unsigned long __kernel_ino_t; typedef unsigned long long __kernel_ino64_t; -- 1.7.0.4

1 0