April 2013 - U-Boot

[U-Boot] [PATCH V2] README: document the requirements for CONFIG_SYS_HZ
by Stephen Warren 03 Apr '13

03 Apr '13

CONFIG_SYS_HZ must be 1000, and get_timer() must therefore return ms. Document this. README text provided by Tom Rini. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- v2: Reworded the README text. --- README | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README b/README index 7f2506a..efb8cc6 100644 --- a/README +++ b/README @@ -495,6 +495,13 @@ The following options need to be configured: exists, unlike the similar options in the Linux kernel. Do not set these options unless they apply! +- CPU timer options: + CONFIG_SYS_HZ + + The frequency of the timer returned by get_timer(). + get_timer() must operate in milliseconds and this CONFIG + option must be set to 1000. + - Linux Kernel Interface: CONFIG_CLOCKS_IN_MHZ -- 1.7.10.4

2 1

[U-Boot] [PATCH V2] disk: fix unaligned access in efi partitions
by Marc Dietrich 03 Apr '13

03 Apr '13

start_sect is not aligned to a 4 byte boundary thus causing exceptions on ARM platforms. Access this field via the get_unaligned_le32 macro. Signed-off-by: Marc Dietrich <marvin24(a)gmx.de> --- V2: replace le32_to_cpu(get_unaligned()) with get_unaligned_le32 disk/part_efi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index b3fd0e9..e9987f0 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -30,6 +30,7 @@ * * This limits the maximum size of addressable storage to < 2 Terra Bytes */ +#include <asm/unaligned.h> #include <common.h> #include <command.h> #include <ide.h> @@ -505,7 +506,7 @@ err: static int pmbr_part_valid(struct partition *part) { if (part->sys_ind == EFI_PMBR_OSTYPE_EFI_GPT && - le32_to_cpu(part->start_sect) == 1UL) { + get_unaligned_le32(&part->start_sect) == 1UL) { return 1; } -- 1.7.9.5

2 1

[U-Boot] [PATCH] replace last __bss_end__ occurrences with __bss_end
by Albert ARIBAUD 03 Apr '13

03 Apr '13

Simon Glass' commit 3929fb0a141530551b3fce15ee08629f80d5ef2a, which changed all occurrences of __bss__end__ into __bss_end, left behind some untouched __bss_end__ occurrences in all 33 u-boot.lds.debug files, in board/mousse/u-boot.lds.ram and in board/mousse/u-boot.lds.rom. These are replaced here. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- board/LEOX/elpt860/u-boot.lds.debug | 2 +- board/RPXClassic/u-boot.lds.debug | 2 +- board/RPXlite/u-boot.lds.debug | 2 +- board/RPXlite_dw/u-boot.lds.debug | 2 +- board/cogent/u-boot.lds.debug | 2 +- board/cray/L1/u-boot.lds.debug | 2 +- board/eltec/mhpc/u-boot.lds.debug | 2 +- board/emk/top860/u-boot.lds.debug | 2 +- board/flagadm/u-boot.lds.debug | 2 +- board/genietv/u-boot.lds.debug | 2 +- board/hermes/u-boot.lds.debug | 2 +- board/hymod/u-boot.lds.debug | 2 +- board/icu862/u-boot.lds.debug | 2 +- board/ip860/u-boot.lds.debug | 2 +- board/ivm/u-boot.lds.debug | 2 +- board/kup/kup4k/u-boot.lds.debug | 2 +- board/kup/kup4x/u-boot.lds.debug | 2 +- board/lwmon/u-boot.lds.debug | 2 +- board/mbx8xx/u-boot.lds.debug | 2 +- board/mousse/u-boot.lds.ram | 2 +- board/mousse/u-boot.lds.rom | 2 +- board/mpl/pip405/u-boot.lds.debug | 2 +- board/netphone/u-boot.lds.debug | 2 +- board/netta/u-boot.lds.debug | 2 +- board/netta2/u-boot.lds.debug | 2 +- board/netvia/u-boot.lds.debug | 2 +- board/nx823/u-boot.lds.debug | 2 +- board/quantum/u-boot.lds.debug | 2 +- board/sandburst/karef/u-boot.lds.debug | 2 +- board/sandburst/metrobox/u-boot.lds.debug | 2 +- board/spd8xx/u-boot.lds.debug | 2 +- board/stx/stxxtc/u-boot.lds.debug | 2 +- board/svm_sc8xx/u-boot.lds.debug | 2 +- board/w7o/u-boot.lds.debug | 2 +- board/xes/xpedite1000/u-boot.lds.debug | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/board/LEOX/elpt860/u-boot.lds.debug b/board/LEOX/elpt860/u-boot.lds.debug index 92901b1..592d9e3 100644 --- a/board/LEOX/elpt860/u-boot.lds.debug +++ b/board/LEOX/elpt860/u-boot.lds.debug @@ -134,6 +134,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/RPXClassic/u-boot.lds.debug b/board/RPXClassic/u-boot.lds.debug index e88bd97..40f17e9 100644 --- a/board/RPXClassic/u-boot.lds.debug +++ b/board/RPXClassic/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/RPXlite/u-boot.lds.debug b/board/RPXlite/u-boot.lds.debug index e88bd97..40f17e9 100644 --- a/board/RPXlite/u-boot.lds.debug +++ b/board/RPXlite/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/RPXlite_dw/u-boot.lds.debug b/board/RPXlite_dw/u-boot.lds.debug index 88c410c..7b89b4f 100644 --- a/board/RPXlite_dw/u-boot.lds.debug +++ b/board/RPXlite_dw/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/cogent/u-boot.lds.debug b/board/cogent/u-boot.lds.debug index e88bd97..40f17e9 100644 --- a/board/cogent/u-boot.lds.debug +++ b/board/cogent/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/cray/L1/u-boot.lds.debug b/board/cray/L1/u-boot.lds.debug index 99cbed4..1b45e5e 100644 --- a/board/cray/L1/u-boot.lds.debug +++ b/board/cray/L1/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/eltec/mhpc/u-boot.lds.debug b/board/eltec/mhpc/u-boot.lds.debug index 614bbb2..a33b0a6 100644 --- a/board/eltec/mhpc/u-boot.lds.debug +++ b/board/eltec/mhpc/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/emk/top860/u-boot.lds.debug b/board/emk/top860/u-boot.lds.debug index 39807d4..704e8c9 100644 --- a/board/emk/top860/u-boot.lds.debug +++ b/board/emk/top860/u-boot.lds.debug @@ -126,6 +126,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/flagadm/u-boot.lds.debug b/board/flagadm/u-boot.lds.debug index 614bbb2..a33b0a6 100644 --- a/board/flagadm/u-boot.lds.debug +++ b/board/flagadm/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/genietv/u-boot.lds.debug b/board/genietv/u-boot.lds.debug index a3aeb60..cc86941 100644 --- a/board/genietv/u-boot.lds.debug +++ b/board/genietv/u-boot.lds.debug @@ -138,6 +138,6 @@ SECTIONS { common/env_embedded.o (.ppcenv) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/hermes/u-boot.lds.debug b/board/hermes/u-boot.lds.debug index 4383c49..982b0f3 100644 --- a/board/hermes/u-boot.lds.debug +++ b/board/hermes/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/hymod/u-boot.lds.debug b/board/hymod/u-boot.lds.debug index e88bd97..40f17e9 100644 --- a/board/hymod/u-boot.lds.debug +++ b/board/hymod/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/icu862/u-boot.lds.debug b/board/icu862/u-boot.lds.debug index 9995288..d5220cc 100644 --- a/board/icu862/u-boot.lds.debug +++ b/board/icu862/u-boot.lds.debug @@ -133,6 +133,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/ip860/u-boot.lds.debug b/board/ip860/u-boot.lds.debug index 0b34177..ecc9f26 100644 --- a/board/ip860/u-boot.lds.debug +++ b/board/ip860/u-boot.lds.debug @@ -133,6 +133,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/ivm/u-boot.lds.debug b/board/ivm/u-boot.lds.debug index bae9fb2..62c66d7 100644 --- a/board/ivm/u-boot.lds.debug +++ b/board/ivm/u-boot.lds.debug @@ -133,6 +133,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/kup/kup4k/u-boot.lds.debug b/board/kup/kup4k/u-boot.lds.debug index 88c410c..7b89b4f 100644 --- a/board/kup/kup4k/u-boot.lds.debug +++ b/board/kup/kup4k/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/kup/kup4x/u-boot.lds.debug b/board/kup/kup4x/u-boot.lds.debug index 88c410c..7b89b4f 100644 --- a/board/kup/kup4x/u-boot.lds.debug +++ b/board/kup/kup4x/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/lwmon/u-boot.lds.debug b/board/lwmon/u-boot.lds.debug index 1d1b76a..cb5ed9c 100644 --- a/board/lwmon/u-boot.lds.debug +++ b/board/lwmon/u-boot.lds.debug @@ -133,6 +133,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/mbx8xx/u-boot.lds.debug b/board/mbx8xx/u-boot.lds.debug index 063f2cc..1135117 100644 --- a/board/mbx8xx/u-boot.lds.debug +++ b/board/mbx8xx/u-boot.lds.debug @@ -133,6 +133,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/mousse/u-boot.lds.ram b/board/mousse/u-boot.lds.ram index 5255651..2055429 100644 --- a/board/mousse/u-boot.lds.ram +++ b/board/mousse/u-boot.lds.ram @@ -96,6 +96,6 @@ SECTIONS common/env_embedded.o (.ppcenv) } > ram - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/mousse/u-boot.lds.rom b/board/mousse/u-boot.lds.rom index 29a34fb..3c7c544 100644 --- a/board/mousse/u-boot.lds.rom +++ b/board/mousse/u-boot.lds.rom @@ -123,6 +123,6 @@ SECTIONS *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/mpl/pip405/u-boot.lds.debug b/board/mpl/pip405/u-boot.lds.debug index 99cbed4..1b45e5e 100644 --- a/board/mpl/pip405/u-boot.lds.debug +++ b/board/mpl/pip405/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/netphone/u-boot.lds.debug b/board/netphone/u-boot.lds.debug index e1fe052..5f74337 100644 --- a/board/netphone/u-boot.lds.debug +++ b/board/netphone/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/netta/u-boot.lds.debug b/board/netta/u-boot.lds.debug index e1fe052..5f74337 100644 --- a/board/netta/u-boot.lds.debug +++ b/board/netta/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/netta2/u-boot.lds.debug b/board/netta2/u-boot.lds.debug index e1fe052..5f74337 100644 --- a/board/netta2/u-boot.lds.debug +++ b/board/netta2/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/netvia/u-boot.lds.debug b/board/netvia/u-boot.lds.debug index 3243fc0..2fb5897 100644 --- a/board/netvia/u-boot.lds.debug +++ b/board/netvia/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/nx823/u-boot.lds.debug b/board/nx823/u-boot.lds.debug index 614bbb2..a33b0a6 100644 --- a/board/nx823/u-boot.lds.debug +++ b/board/nx823/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/quantum/u-boot.lds.debug b/board/quantum/u-boot.lds.debug index abc4640..c4cc39d 100644 --- a/board/quantum/u-boot.lds.debug +++ b/board/quantum/u-boot.lds.debug @@ -125,6 +125,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/sandburst/karef/u-boot.lds.debug b/board/sandburst/karef/u-boot.lds.debug index 6b99f13..b3b365e 100644 --- a/board/sandburst/karef/u-boot.lds.debug +++ b/board/sandburst/karef/u-boot.lds.debug @@ -141,6 +141,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/sandburst/metrobox/u-boot.lds.debug b/board/sandburst/metrobox/u-boot.lds.debug index 0b4192e..412af14 100644 --- a/board/sandburst/metrobox/u-boot.lds.debug +++ b/board/sandburst/metrobox/u-boot.lds.debug @@ -141,6 +141,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/spd8xx/u-boot.lds.debug b/board/spd8xx/u-boot.lds.debug index 063f2cc..1135117 100644 --- a/board/spd8xx/u-boot.lds.debug +++ b/board/spd8xx/u-boot.lds.debug @@ -133,6 +133,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/stx/stxxtc/u-boot.lds.debug b/board/stx/stxxtc/u-boot.lds.debug index e1fe052..5f74337 100644 --- a/board/stx/stxxtc/u-boot.lds.debug +++ b/board/stx/stxxtc/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/svm_sc8xx/u-boot.lds.debug b/board/svm_sc8xx/u-boot.lds.debug index abc4640..c4cc39d 100644 --- a/board/svm_sc8xx/u-boot.lds.debug +++ b/board/svm_sc8xx/u-boot.lds.debug @@ -125,6 +125,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/w7o/u-boot.lds.debug b/board/w7o/u-boot.lds.debug index 18b7752..5792bac 100644 --- a/board/w7o/u-boot.lds.debug +++ b/board/w7o/u-boot.lds.debug @@ -132,6 +132,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } diff --git a/board/xes/xpedite1000/u-boot.lds.debug b/board/xes/xpedite1000/u-boot.lds.debug index c02581d..cb26f0d 100644 --- a/board/xes/xpedite1000/u-boot.lds.debug +++ b/board/xes/xpedite1000/u-boot.lds.debug @@ -137,6 +137,6 @@ SECTIONS *(.bss) *(COMMON) } - __bss_end__ = . ; + __bss_end = . ; PROVIDE (end = .); } -- 1.7.10.4

2 1

[U-Boot] [PATCH] mmc: don't allow extra cmdline arguments
by Stephen Warren 03 Apr '13

03 Apr '13

From: Stephen Warren <swarren(a)nvidia.com> The "mmc rescan" command takes no arguments. However, executing "mmc rescan 1" succeeds, leading the user to believe that MMC device 1 has been rescanned. In fact, the "current" MMC device has been rescanned, and the current device may well not be 1. Add error-checking to the "mmc" command to explicitly reject any extra command-line arguments so that it's more obvious when U-Boot isn't doing what the user thought they asked it to. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- common/cmd_mmc.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 8c53a10..9f3d6c5 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -164,8 +164,12 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } if (strcmp(argv[1], "rescan") == 0) { - struct mmc *mmc = find_mmc_device(curr_device); + struct mmc *mmc; + if (argc != 2) + return CMD_RET_USAGE; + + mmc = find_mmc_device(curr_device); if (!mmc) { printf("no mmc device at slot %x\n", curr_device); return 1; @@ -179,8 +183,12 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 0; } else if (strncmp(argv[1], "part", 4) == 0) { block_dev_desc_t *mmc_dev; - struct mmc *mmc = find_mmc_device(curr_device); + struct mmc *mmc; + + if (argc != 2) + return CMD_RET_USAGE; + mmc = find_mmc_device(curr_device); if (!mmc) { printf("no mmc device at slot %x\n", curr_device); return 1; @@ -196,6 +204,8 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) puts("get mmc type error!\n"); return 1; } else if (strcmp(argv[1], "list") == 0) { + if (argc != 2) + return CMD_RET_USAGE; print_mmc_devices('\n'); return 0; } else if (strcmp(argv[1], "dev") == 0) { -- 1.7.10.4

2 1

[U-Boot] [PATCH 1/1] i.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command
by Javier Martinez Canillas 03 Apr '13

03 Apr '13

since commit "c1173bd0: sf command: allow default bus and chip selects" the chip-select and bus arguments for the sf probe command are optional. Even when passing the chip-select to sf probe says to be optional, it makes "sf erase" and "sf write" to fail on a mx6qsabrelite board. e.g: MX6QSABRELITE U-Boot > sf probe 1 MX6QSABRELITE U-Boot > sf erase 0 0x40000 SPI flash erase failed MX6QSABRELITE U-Boot > sf write 0x10800000 0 0x40000 SPI flash write failed But just using "sf probe" works well. So, update the mx6qsabrelite README so the commands will work on current U-Boot. Signed-off-by: Javier Martinez Canillas <javier.martinez(a)collabora.co.uk> --- board/freescale/mx6qsabrelite/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/mx6qsabrelite/README b/board/freescale/mx6qsabrelite/README index 6f2f534..324b116 100644 --- a/board/freescale/mx6qsabrelite/README +++ b/board/freescale/mx6qsabrelite/README @@ -40,7 +40,7 @@ enter the following commands: MX6Q SABRELITE U-Boot > mmc dev 0 MX6Q SABRELITE U-Boot > mmc read 0x10800000 0 200 - MX6Q SABRELITE U-Boot > sf probe 1 + MX6Q SABRELITE U-Boot > sf probe MX6Q SABRELITE U-Boot > sf erase 0 0x40000 MX6Q SABRELITE U-Boot > sf write 0x10800000 0 0x40000 -- 1.7.7.6

3 7

[U-Boot] [PATCH 2/2] OMAP4: Add basic support for OMAP4470/TWL6032
by Lubomir Popov 03 Apr '13

03 Apr '13

H/W used for test: TI Blaze/Tablet OMAP4470 Processor Board (750-2173-005) mounted on a custom main board (MMS benvolio4). Fixed bug in vcores_data omap4460_volts struct referencing tps62361 instead of twl6030 for core and mm voltages. Fixed some comments. Signed-off-by: Lubomir Popov <lpopov(a)mm-sol.com> --- arch/arm/cpu/armv7/omap4/hw_data.c | 53 ++++++++++++++++++++++-- arch/arm/cpu/armv7/omap4/hwinit.c | 6 +++ arch/arm/cpu/armv7/omap4/sdram_elpida.c | 65 ++++++++++++++++++++++++++---- arch/arm/include/asm/arch-omap4/clocks.h | 7 +++- arch/arm/include/asm/arch-omap4/omap.h | 1 + 5 files changed, 119 insertions(+), 13 deletions(-) diff --git a/arch/arm/cpu/armv7/omap4/hw_data.c b/arch/arm/cpu/armv7/omap4/hw_data.c index 7551b98..fc4990a 100644 --- a/arch/arm/cpu/armv7/omap4/hw_data.c +++ b/arch/arm/cpu/armv7/omap4/hw_data.c @@ -7,6 +7,9 @@ * * Sricharan R <r.sricharan(a)ti.com> * + * 03/2013 Lubomir Popov <lpopov(a)mm-sol.com> <l-popov(a)ti.com> + * Added basic support for 750-2173 OMAP4470 board. + * * See file CREDITS for list of people who contributed to this * project. * @@ -66,6 +69,7 @@ static const struct dpll_params mpu_dpll_params_1400mhz[NUM_SYS_CLKS] = { /* * dpll locked at 1600 MHz - MPU clk at 800 MHz(OPP Turbo 4430) * OMAP4430 OPP_TURBO frequency + * OMAP4470 OPP_NOM frequency */ static const struct dpll_params mpu_dpll_params_1600mhz[NUM_SYS_CLKS] = { {200, 2, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1}, /* 12 MHz */ @@ -92,6 +96,7 @@ static const struct dpll_params mpu_dpll_params_1200mhz[NUM_SYS_CLKS] = { }; /* OMAP4460 OPP_NOM frequency */ +/* OMAP4470 OPP_NOM (Low Power) frequency */ static const struct dpll_params core_dpll_params_1600mhz[NUM_SYS_CLKS] = { {200, 2, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1}, /* 12 MHz */ {800, 12, 1, 5, 8, 4, 6, 5, -1, -1, -1, -1}, /* 13 MHz */ @@ -214,16 +219,30 @@ struct dplls omap4460_dplls = { .ddr = NULL }; +struct dplls omap4470_dplls = { + .mpu = mpu_dpll_params_1600mhz, + .core = core_dpll_params_1600mhz, + .per = per_dpll_params_1536mhz, + .iva = iva_dpll_params_1862mhz, +#ifdef CONFIG_SYS_OMAP_ABE_SYSCK + .abe = abe_dpll_params_sysclk_196608khz, +#else + .abe = &abe_dpll_params_32k_196608khz, +#endif + .usb = usb_dpll_params_1920mhz, + .ddr = NULL +}; + struct pmic_data twl6030_4430es1 = { .base_offset = PHOENIX_SMPS_BASE_VOLT_STD_MODE_UV, - .step = 12660, /* 10 mV represented in uV */ + .step = 12660, /* 12.7 mV represented in uV */ /* The code starts at 1 not 0 */ .start_code = 1, }; struct pmic_data twl6030 = { .base_offset = PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV, - .step = 12660, /* 10 mV represented in uV */ + .step = 12660, /* 12.7 mV represented in uV */ /* The code starts at 1 not 0 */ .start_code = 1, }; @@ -236,6 +255,13 @@ struct pmic_data tps62361 = { .gpio_en = 1 }; +struct pmic_data twl6032 = { + .base_offset = PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV, + .step = 12660, /* 12.7 mV represented in uV */ + /* The code starts at 1 not 0 */ + .start_code = 1, +}; + struct vcores_data omap4430_volts_es1 = { .mpu.value = 1325, .mpu.addr = SMPS_REG_ADDR_VCORE1, @@ -271,11 +297,25 @@ struct vcores_data omap4460_volts = { .core.value = 1200, .core.addr = SMPS_REG_ADDR_VCORE1, - .core.pmic = &tps62361, + .core.pmic = &twl6030, .mm.value = 1200, .mm.addr = SMPS_REG_ADDR_VCORE2, - .mm.pmic = &tps62361, + .mm.pmic = &twl6030, +}; + +struct vcores_data omap4470_volts = { + .mpu.value = 1203, + .mpu.addr = SMPS1_REG_ADDR_MPU, + .mpu.pmic = &twl6032, + + .core.value = 1127, + .core.addr = SMPS2_REG_ADDR_CORE, + .core.pmic = &twl6032, + + .mm.value = 1139, + .mm.addr = SMPS5_REG_ADDR_MM, + .mm.pmic = &twl6032, }; /* @@ -483,6 +523,11 @@ void hw_data_init(void) *omap_vcores = &omap4460_volts; break; + case OMAP4470_ES1_0: + *dplls_data = &omap4470_dplls; + *omap_vcores = &omap4470_volts; + break; + default: printf("\n INVALID OMAP REVISION "); } diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c index 2db517b..586ffe2 100644 --- a/arch/arm/cpu/armv7/omap4/hwinit.c +++ b/arch/arm/cpu/armv7/omap4/hwinit.c @@ -9,6 +9,9 @@ * Aneesh V <aneesh(a)ti.com> * Steve Sakoman <steve(a)sakoman.com> * + * 03/2013 Lubomir Popov <lpopov(a)mm-sol.com> <l-popov(a)ti.com> + * Added basic support for 750-2173 OMAP4470 board. + * * See file CREDITS for list of people who contributed to this * project. * @@ -153,6 +156,9 @@ void init_omap_revision(void) break; case MIDR_CORTEX_A9_R2P10: switch (readl(CONTROL_ID_CODE)) { + case OMAP4470_CONTROL_ID_CODE_ES1_0: + *omap_si_rev = OMAP4470_ES1_0; + break; case OMAP4460_CONTROL_ID_CODE_ES1_1: *omap_si_rev = OMAP4460_ES1_1; break; diff --git a/arch/arm/cpu/armv7/omap4/sdram_elpida.c b/arch/arm/cpu/armv7/omap4/sdram_elpida.c index 20fc552..61dadc8 100644 --- a/arch/arm/cpu/armv7/omap4/sdram_elpida.c +++ b/arch/arm/cpu/armv7/omap4/sdram_elpida.c @@ -7,6 +7,9 @@ * * Aneesh V <aneesh(a)ti.com> * + * 03/2013 Lubomir Popov <lpopov(a)mm-sol.com> <l-popov(a)ti.com> + * Added basic support for 750-2173 OMAP4470 board. + * * See file CREDITS for list of people who contributed to this * project. * @@ -90,6 +93,21 @@ const struct emif_regs emif_regs_elpida_400_mhz_2cs = { .emif_ddr_phy_ctlr_1 = 0x049ff418 }; +/* 4 Gb devices on the 750-2173 4470 Processor Board */ +const struct emif_regs emif_regs_elpida_400_mhz_1cs = { + .sdram_config_init = 0x80800eb2, + .sdram_config = 0x80801ab2, + .ref_ctrl = 0x00000618, + .sdram_tim1 = 0x10eb0662, + .sdram_tim2 = 0x20370dd2, + .sdram_tim3 = 0x00b1c33f, + .read_idle_ctrl = 0x000501ff, + .zq_config = 0xd00b3215, + .temp_alert_config = 0x58016893, + .emif_ddr_phy_ctlr_1_init = 0x449ffff5, + .emif_ddr_phy_ctlr_1 = 0x449ff408 +}; + const struct dmm_lisa_map_regs lisa_map_2G_x_1_x_2 = { .dmm_lisa_map_0 = 0xFF020100, .dmm_lisa_map_1 = 0, @@ -114,6 +132,22 @@ const struct dmm_lisa_map_regs ma_lisa_map_2G_x_2_x_2 = { .is_ma_present = 0x1 }; +const struct dmm_lisa_map_regs lisa_map_4G_x_1_x_2 = { + .dmm_lisa_map_0 = 0xFF020100, + .dmm_lisa_map_1 = 0, + .dmm_lisa_map_2 = 0, + .dmm_lisa_map_3 = 0x80640300, + .is_ma_present = 0x0 +}; + +const struct dmm_lisa_map_regs ma_lisa_map_4G_x_1_x_2 = { + .dmm_lisa_map_0 = 0xFF020100, + .dmm_lisa_map_1 = 0, + .dmm_lisa_map_2 = 0, + .dmm_lisa_map_3 = 0x80640300, + .is_ma_present = 0x1 +}; + static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs) { u32 omap4_rev = omap_revision(); @@ -123,8 +157,10 @@ static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs) *regs = &emif_regs_elpida_380_mhz_1cs; else if (omap4_rev == OMAP4430_ES2_0) *regs = &emif_regs_elpida_200_mhz_2cs; - else + else if (omap4_rev < OMAP4470_ES1_0) *regs = &emif_regs_elpida_400_mhz_2cs; + else + *regs = &emif_regs_elpida_400_mhz_1cs; } void emif_get_reg_dump(u32 emif_nr, const struct emif_regs **regs) __attribute__((weak, alias("emif_get_reg_dump_sdp"))); @@ -138,8 +174,10 @@ static void emif_get_dmm_regs_sdp(const struct dmm_lisa_map_regs *dmm_lisa_regs = &lisa_map_2G_x_1_x_2; else if (omap_rev < OMAP4460_ES1_0) *dmm_lisa_regs = &lisa_map_2G_x_2_x_2; - else + else if (omap_rev < OMAP4470_ES1_0) *dmm_lisa_regs = &ma_lisa_map_2G_x_2_x_2; + else + *dmm_lisa_regs = &ma_lisa_map_4G_x_1_x_2; } void emif_get_dmm_regs(const struct dmm_lisa_map_regs **dmm_lisa_regs) @@ -154,20 +192,31 @@ static const struct lpddr2_device_details elpida_2G_S4_details = { .manufacturer = LPDDR2_MANUFACTURER_ELPIDA }; +static const struct lpddr2_device_details elpida_4G_S4_details = { + .type = LPDDR2_TYPE_S4, + .density = LPDDR2_DENSITY_4Gb, + .io_width = LPDDR2_IO_WIDTH_32, + .manufacturer = LPDDR2_MANUFACTURER_ELPIDA +}; + struct lpddr2_device_details *emif_get_device_details_sdp(u32 emif_nr, u8 cs, struct lpddr2_device_details *lpddr2_dev_details) { u32 omap_rev = omap_revision(); /* EMIF1 & EMIF2 have identical configuration */ - if ((omap_rev == OMAP4430_ES1_0) && (cs == CS1)) { - /* Nothing connected on CS1 for ES1.0 */ + if (((omap_rev == OMAP4430_ES1_0) || (omap_rev == OMAP4470_ES1_0)) + && (cs == CS1)) { + /* Nothing connected on CS1 for 4430/4470 ES1.0 */ return NULL; - } else { - /* In all other cases Elpida 2G device */ + } else if (omap_rev < OMAP4470_ES1_0) { + /* In all other 4430/4460 cases Elpida 2G device */ *lpddr2_dev_details = elpida_2G_S4_details; - return lpddr2_dev_details; + } else { + /* 4470: 4G device */ + *lpddr2_dev_details = elpida_4G_S4_details; } + return lpddr2_dev_details; } struct lpddr2_device_details *emif_get_device_details(u32 emif_nr, u8 cs, @@ -281,7 +330,7 @@ void emif_get_device_timings_sdp(u32 emif_nr, /* Identical devices on EMIF1 & EMIF2 */ *cs0_device_timings = &elpida_2G_S4_timings; - if (omap_rev == OMAP4430_ES1_0) + if ((omap_rev == OMAP4430_ES1_0) || (omap_rev == OMAP4470_ES1_0)) *cs1_device_timings = NULL; else *cs1_device_timings = &elpida_2G_S4_timings; diff --git a/arch/arm/include/asm/arch-omap4/clocks.h b/arch/arm/include/asm/arch-omap4/clocks.h index ed7a1c8..1b89158 100644 --- a/arch/arm/include/asm/arch-omap4/clocks.h +++ b/arch/arm/include/asm/arch-omap4/clocks.h @@ -188,11 +188,16 @@ /* PRM_VC_VAL_BYPASS */ #define PRM_VC_I2C_CHANNEL_FREQ_KHZ 400 -/* SMPS */ +/* PMIC Slave Address */ #define SMPS_I2C_SLAVE_ADDR 0x12 +/* TWL6030 SMPS */ #define SMPS_REG_ADDR_VCORE1 0x55 #define SMPS_REG_ADDR_VCORE2 0x5B #define SMPS_REG_ADDR_VCORE3 0x61 +/* TWL6032 SMPS */ +#define SMPS1_REG_ADDR_MPU 0x55 /* mpu */ +#define SMPS5_REG_ADDR_MM 0x49 /* mm */ +#define SMPS2_REG_ADDR_CORE 0x5B /* core */ #define PHOENIX_SMPS_BASE_VOLT_STD_MODE_UV 607700 #define PHOENIX_SMPS_BASE_VOLT_STD_MODE_WITH_OFFSET_UV 709000 diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h index 5f321fe..e3362c8 100644 --- a/arch/arm/include/asm/arch-omap4/omap.h +++ b/arch/arm/include/asm/arch-omap4/omap.h @@ -65,6 +65,7 @@ #define OMAP4_CONTROL_ID_CODE_ES2_3 0x6B95C02F #define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F #define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F +#define OMAP4470_CONTROL_ID_CODE_ES1_0 0x0B97502F /* UART */ #define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000) -- 1.7.9.5

1 0

[U-Boot] Subject: [PATCH 1/2] OMAP4: Add ID for OMAP4470_ES1_0
by Lubomir Popov 03 Apr '13

03 Apr '13

Signed-off-by: Lubomir Popov <lpopov(a)mm-sol.com> --- arch/arm/include/asm/omap_common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h index 091ddb5..f042c10 100644 --- a/arch/arm/include/asm/omap_common.h +++ b/arch/arm/include/asm/omap_common.h @@ -573,6 +573,7 @@ static inline u32 omap_revision(void) #define OMAP4430_ES2_3 0x44300230 #define OMAP4460_ES1_0 0x44600100 #define OMAP4460_ES1_1 0x44600110 +#define OMAP4470_ES1_0 0x44700100 /* omap5 */ #define OMAP5430_SILICON_ID_INVALID 0 -- 1.7.9.5

1 0

[U-Boot] Unable to build u-boot for Marvell Aspenite board
by Fabrice Mousset 03 Apr '13

03 Apr '13

Hi all, I want to build U-Boot 2013.01.01 for my PXA168 evaluation board, called Aspenite. I have seen that this board is already supported by U-Boot. For the compilation, I use the cross-compiler submitted by Marvell : arm-marvell-linux-gnueabi-gcc 4.2.0. To compile U-Boot, I have used following commands (my OS is Ubuntu 12.04.2 LTS): make CROSS_COMPILE=/usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi- ARCH=arm aspenite_config make CROSS_COMPILE=/usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi- ARCH=arm After seconds, compilation ends with following errors: /usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi-ld: section .bss [00619c58 -> 006201fb] overlaps section .rel.dyn [00619c58 -> 0061cd77] /usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi-ld: section .dynsym [0061cd78 -> 0061ce77] overlaps section .bss [00619c58 -> 006201fb] /usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi-ld: u-boot: section .bss lma 0x619c58 overlaps previous sections make: *** [u-boot] Erreur 1 I don't understand those error messages, I don't know what I do wrong. I have found another board with PXA168 which is supported by U-Boot. This board is called dplugd, so I have tried to compile it: First, I cleared the last settings: make CROSS_COMPILE=/usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi- ARCH=arm mrproper then I configure U-Boot for the GPLUGD board make CROSS_COMPILE=/usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi- ARCH=arm gplugd_config And finally start the compilation make CROSS_COMPILE=/usr/local/arm-marvell-linux-gnueabi/bin/arm-marvell-linux-gnueabi- ARCH=arm After some seconds, the compilation is finished without any error ! I don't understand why the compilation works for the DPLUGD Board and not for the Aspenite Board. Most of the files are common. Can someone please help me to resolve this issue? Best regards Fabrice Mousset

1 0

[U-Boot] [PATCH v2 1/1] i.MX6: mx6qsabrelite: README: don't pass chip-select to sf probe command
by Javier Martinez Canillas 03 Apr '13

03 Apr '13

board/freescale/mx6qsabrelite/README explain a procedure to update the SPI-NOR on the SabreLite board without Freescale manufacturing tool but following this procedure leads to both "sf erase" and "sf write" failing on a mx6qsabrelite board: MX6QSABRELITE U-Boot > sf probe 1 MX6QSABRELITE U-Boot > sf erase 0 0x40000 SPI flash erase failed MX6QSABRELITE U-Boot > sf write 0x10800000 0 0x40000 SPI flash write failed This is because the chip-select 1 is wrong and the correct value is 0x7300. Since commit c1173bd0 ("sf command: allow default bus and chip selects") the chip-select and bus arguments for the sf probe command are optional so let's just remove it and use "sf probe" instead. Signed-off-by: Javier Martinez Canillas <javier.martinez(a)collabora.co.uk> --- Changes since v1: - Fix the description by explaining that the chip-select can be passed but the value "1" is wrong and is not strictly required; suggested by Stefano Babic. board/freescale/mx6qsabrelite/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/mx6qsabrelite/README b/board/freescale/mx6qsabrelite/README index 6f2f534..324b116 100644 --- a/board/freescale/mx6qsabrelite/README +++ b/board/freescale/mx6qsabrelite/README @@ -40,7 +40,7 @@ enter the following commands: MX6Q SABRELITE U-Boot > mmc dev 0 MX6Q SABRELITE U-Boot > mmc read 0x10800000 0 200 - MX6Q SABRELITE U-Boot > sf probe 1 + MX6Q SABRELITE U-Boot > sf probe MX6Q SABRELITE U-Boot > sf erase 0 0x40000 MX6Q SABRELITE U-Boot > sf write 0x10800000 0 0x40000 -- 1.7.7.6

2 1

[U-Boot] [PATCH v10 01/30] mtd: nand: Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT
by Benoît Thébaudeau 03 Apr '13

03 Apr '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Introduce CONFIG_SYS_NAND_BUSWIDTH_16BIT option so that other NAND controller drivers could use it when a 16-bit NAND is deployed. drivers/mtd/nand/ndfc has CONFIG_SYS_NDFC_16BIT, so just rename it, so that other NAND drivers could reuse the same symbol. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Acked-by: Scott Wood <scottwood(a)freescale.com> --- Changes in v10: None Changes in v9: None Changes in v8: - New patch. Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None README | 9 ++++++--- drivers/mtd/nand/ndfc.c | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README b/README index a35ef31..46e5328 100644 --- a/README +++ b/README @@ -3763,9 +3763,12 @@ Low Level (hardware related) configuration options: - CONFIG_SYS_SRIOn_MEM_SIZE: Size of SRIO port 'n' memory region -- CONFIG_SYS_NDFC_16 - Defined to tell the NDFC that the NAND chip is using a - 16 bit bus. +- CONFIG_SYS_NAND_BUSWIDTH_16BIT + Defined to tell the NAND controller that the NAND chip is using + a 16 bit bus. + Not all NAND drivers use this symbol. + Example of driver that uses it: + - drivers/mtd/nand/ndfc.c - CONFIG_SYS_NDFC_EBC0_CFG Sets the EBC0_CFG register for the NDFC. If not defined diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index 6ebbb5e..213d2c9 100644 --- a/drivers/mtd/nand/ndfc.c +++ b/drivers/mtd/nand/ndfc.c @@ -156,7 +156,7 @@ static uint8_t ndfc_read_byte(struct mtd_info *mtd) struct nand_chip *chip = mtd->priv; -#ifdef CONFIG_SYS_NDFC_16BIT +#ifdef CONFIG_SYS_NAND_BUSWIDTH_16BIT return (uint8_t) readw(chip->IO_ADDR_R); #else return readb(chip->IO_ADDR_R); @@ -218,7 +218,7 @@ int board_nand_init(struct nand_chip *nand) nand->ecc.bytes = 3; nand->select_chip = ndfc_select_chip; -#ifdef CONFIG_SYS_NDFC_16BIT +#ifdef CONFIG_SYS_NAND_BUSWIDTH_16BIT nand->options |= NAND_BUSWIDTH_16; #endif -- 1.7.10.4

2 30