March 2012 - U-Boot

[U-Boot] [PATCH 0/3] mmc: support sdhci instead of s5p_mmc
by Jaehoon Chung 30 Mar '12

30 Mar '12

This patchset is supported the sdhci controller for Samsung-SoC. In mmc driver, already implemented the generic sdhci. There is no reason that didn't use sdhci.c. So, use the sdhci instead of s5p_mmc. Jaehoon Chung (3): mmc: sdhci: fix the wrong operation when response type is R1b mmc: use sdhci.c instead of s5p_mmc.c ARM: SAMSUNG: support sdhci controller arch/arm/include/asm/arch-exynos/mmc.h | 93 +++++++++++++++-------------- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 93 +++++++++++++++-------------- drivers/mmc/Makefile | 2 +- drivers/mmc/s5p_sdhci.c | 98 +++++++++++++++++++++++++++++++ drivers/mmc/sdhci.c | 45 +++++++++++--- include/configs/origen.h | 3 +- include/configs/s5p_goni.h | 3 +- include/configs/s5pc210_universal.h | 3 +- include/configs/smdk5250.h | 3 +- include/configs/smdkv310.h | 3 +- include/configs/trats.h | 3 +- include/sdhci.h | 6 ++ 12 files changed, 246 insertions(+), 109 deletions(-) create mode 100644 drivers/mmc/s5p_sdhci.c -- 1.7.4.1

2 2

[U-Boot] [PATCH 1/5] ARM: EXYNOS: definition of system registers
by Donghwa Lee 30 Mar '12

30 Mar '12

This is definition of system registers for EXYNOS SoC. Signed-off-by: Donghwa Lee <dh09.lee(a)samsung.com> Signed-off-by: Inki Dae <inki.dae(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/include/asm/arch-exynos/cpu.h | 2 + arch/arm/include/asm/arch-exynos/system.h | 51 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-exynos/system.h diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 89f2c2e..70048f0 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -29,6 +29,7 @@ /* EXYNOS4 */ #define EXYNOS4_GPIO_PART3_BASE 0x03860000 #define EXYNOS4_PRO_ID 0x10000000 +#define EXYNOS4_SYSREG_BASE 0x10010000 #define EXYNOS4_POWER_BASE 0x10020000 #define EXYNOS4_SWRESET 0x10020400 #define EXYNOS4_CLOCK_BASE 0x10030000 @@ -127,6 +128,7 @@ static inline unsigned int samsung_get_base_##device(void) \ SAMSUNG_BASE(adc, ADC_BASE) SAMSUNG_BASE(clock, CLOCK_BASE) +SAMSUNG_BASE(sysreg, SYSREG_BASE) SAMSUNG_BASE(fimd, FIMD_BASE) SAMSUNG_BASE(gpio_part1, GPIO_PART1_BASE) SAMSUNG_BASE(gpio_part2, GPIO_PART2_BASE) diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/include/asm/arch-exynos/system.h new file mode 100644 index 0000000..2e99c0d --- /dev/null +++ b/arch/arm/include/asm/arch-exynos/system.h @@ -0,0 +1,51 @@ +/* + * (C) Copyright 2012 Samsung Electronics + * Donghwa Lee <dh09.lee(a)samsung.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#ifndef __ASM_ARM_ARCH_SYSTEM_H_ +#define __ASM_ARM_ARCH_SYSTEM_H_ + +#ifndef __ASSEMBLY__ +struct exynos4_sysreg { + unsigned char res1[0x210]; + unsigned int display_ctrl; + unsigned int display_ctrl2; + unsigned int camera_control; + unsigned int audio_endian; + unsigned int jtag_con; +}; + +struct exynos5_sysreg { + unsigned char res1[0x214]; + unsigned int disp1blk_cfg; + unsigned int disp2blk_cfg; + unsigned int hdcp_e_fuse; + unsigned int gsclblk_cfg0; + unsigned int gsclblk_cfg1; + unsigned int reserved; + unsigned int ispblk_cfg; + unsigned int usb20phy_cfg; + unsigned int mipi_dphy; + unsigned int dptx_dphy; + unsigned int phyclk_sel; +}; +#endif + +#endif /* _EXYNOS4_SYSTEM_H */ -- 1.7.4.1

1 0

[U-Boot] [PATCH 0/5] ARM: EXYNOS: add display driver for EXYNOS SoC
by Donghwa Lee 30 Mar '12

30 Mar '12

This patch is for display driver of EXYNOS SoC. [1/5]: ARM: EXYNOS: definition of system registers - to contorl FIMD of LBLK0 bypass selection, add missed definitions of system register [2/5]: ARM: EXYNOS: add data structure for EXYNOS display driver - It is needed to specific vidinfo_t data structure for EXYNOS display driver. [3/5]: ARM: EXYNOS: add exynos lcd clock interface - Is is newly defined to interface to get lcd source clock. [4/5]: ARM: EXYNOS: support EXYNOS display driver [5/5]: ARM: EXYNOS: add Makefile for exynos display driver Thank you, Donghwa Lee

1 0

[U-Boot] [PATCH] ARM: EXYNOS: definition of system registers
by Donghwa Lee 30 Mar '12

30 Mar '12

This is definition of system registers for EXYNOS SoC. Signed-off-by: Donghwa Lee <dh09.lee(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/include/asm/arch-exynos/cpu.h | 2 + arch/arm/include/asm/arch-exynos/system.h | 51 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 0 deletions(-) create mode 100644 arch/arm/include/asm/arch-exynos/system.h diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 89f2c2e..70048f0 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -29,6 +29,7 @@ /* EXYNOS4 */ #define EXYNOS4_GPIO_PART3_BASE 0x03860000 #define EXYNOS4_PRO_ID 0x10000000 +#define EXYNOS4_SYSREG_BASE 0x10010000 #define EXYNOS4_POWER_BASE 0x10020000 #define EXYNOS4_SWRESET 0x10020400 #define EXYNOS4_CLOCK_BASE 0x10030000 @@ -127,6 +128,7 @@ static inline unsigned int samsung_get_base_##device(void) \ SAMSUNG_BASE(adc, ADC_BASE) SAMSUNG_BASE(clock, CLOCK_BASE) +SAMSUNG_BASE(sysreg, SYSREG_BASE) SAMSUNG_BASE(fimd, FIMD_BASE) SAMSUNG_BASE(gpio_part1, GPIO_PART1_BASE) SAMSUNG_BASE(gpio_part2, GPIO_PART2_BASE) diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/include/asm/arch-exynos/system.h new file mode 100644 index 0000000..2e99c0d --- /dev/null +++ b/arch/arm/include/asm/arch-exynos/system.h @@ -0,0 +1,51 @@ +/* + * (C) Copyright 2012 Samsung Electronics + * Donghwa Lee <dh09.lee(a)samsung.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#ifndef __ASM_ARM_ARCH_SYSTEM_H_ +#define __ASM_ARM_ARCH_SYSTEM_H_ + +#ifndef __ASSEMBLY__ +struct exynos4_sysreg { + unsigned char res1[0x210]; + unsigned int display_ctrl; + unsigned int display_ctrl2; + unsigned int camera_control; + unsigned int audio_endian; + unsigned int jtag_con; +}; + +struct exynos5_sysreg { + unsigned char res1[0x214]; + unsigned int disp1blk_cfg; + unsigned int disp2blk_cfg; + unsigned int hdcp_e_fuse; + unsigned int gsclblk_cfg0; + unsigned int gsclblk_cfg1; + unsigned int reserved; + unsigned int ispblk_cfg; + unsigned int usb20phy_cfg; + unsigned int mipi_dphy; + unsigned int dptx_dphy; + unsigned int phyclk_sel; +}; +#endif + +#endif /* _EXYNOS4_SYSTEM_H */ -- 1.7.4.1

2 3

[U-Boot] [PATCH] powerpc/p1022ds: fix BR1/OR1 typo
by Kim Phillips 29 Mar '12

29 Mar '12

fix for commit 39654bda4fcf67c0976d48ad4ad0b8b094d2c93d "powerpc/p1022ds: define BR1/OR1 since DIU expects reasonable values". Signed-off-by: Kim Phillips <kim.phillips(a)freescale.com> --- board/freescale/p1022ds/diu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/p1022ds/diu.c b/board/freescale/p1022ds/diu.c index ddebbc0..e756aa2 100644 --- a/board/freescale/p1022ds/diu.c +++ b/board/freescale/p1022ds/diu.c @@ -19,7 +19,7 @@ #include "../common/ngpixis.h" #include <fsl_diu_fb.h> -#if !defined(CONFIG_SYS_BR1_PRELIM) && !defined(CONFIG_SYS_BR1_PRELIM) +#if !defined(CONFIG_SYS_BR1_PRELIM) && !defined(CONFIG_SYS_OR1_PRELIM) #error #endif -- 1.7.9.4

1 1

[U-Boot] [PATCH 1/2] fdt: Avoid early panic() when there is no FDT present
by Simon Glass 29 Mar '12

29 Mar '12

CONFIG_OF_CONTROL requires a valid device tree. However, we cannot call panic() before the console is set up since the message does not appear, and we get a silent failure. Remove the panic from fdtdec_check_fdt() and provide a new function to prepare the fdt for use. This will be called after the console is ready. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- include/fdtdec.h | 17 +++++++++++++++-- lib/fdtdec.c | 24 +++++++++++++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index 766e0bd..d45acbe 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -157,8 +157,21 @@ s32 fdtdec_get_int(const void *blob, int node, const char *prop_name, int fdtdec_get_is_enabled(const void *blob, int node); /** - * Checks whether we have a valid fdt available to control U-Boot, and panic - * if not. + * Make sure we have a valid fdt available to control U-Boot. + * + * If not, a message is printed to the console if the console is ready. + * + * @return 0 if all ok, -1 if not + */ +int fdtdec_prepare_fdt(void); + +/** + * Checks that we have a valid fdt available to control U-Boot. + + * However, if not then for the moment nothing is done, since this function + * is called too early to panic(). + * + * @returns 0 */ int fdtdec_check_fdt(void); diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 9241d13..0fb6d17 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -276,17 +276,31 @@ int fdtdec_add_aliases_for_id(const void *blob, const char *name, return num_found; } +int fdtdec_check_fdt(void) +{ + /* + * We must have an FDT, but we cannot panic() yet since the console + * is not ready. So for now, just assert(). Boards which need an early + * FDT (prior to console ready) will need to make their own + * arrangements and do their own checks. + */ + assert(!fdtdec_prepare_fdt()); + return 0; +} + /* * This function is a little odd in that it accesses global data. At some * point if the architecture board.c files merge this will make more sense. * Even now, it is common code. */ -int fdtdec_check_fdt(void) +int fdtdec_prepare_fdt(void) { - /* We must have an fdt */ - if (((uintptr_t)gd->fdt_blob & 3) || fdt_check_header(gd->fdt_blob)) - panic("No valid fdt found - please append one to U-Boot\n" - "binary or define CONFIG_OF_EMBED\n"); + if (((uintptr_t)gd->fdt_blob & 3) || fdt_check_header(gd->fdt_blob)) { + printf("No valid FDT found - please append one to U-Boot " + "binary, use u-boot-dtb.bin or define " + "CONFIG_OF_EMBED\n"); + return -1; + } return 0; } -- 1.7.7.3

4 8

[U-Boot] Pull request: Please pull u-boot-coldfire/master
by Jin Zhengxiong-R64188 29 Mar '12

29 Mar '12

Hi, Wolfgang, The following changes since commit 7cb30b13f12077c7eec8ce2419cd96cd65ace8e2: Merge branch 'master' of git://git.denx.de/u-boot-cfi-flash (2012-03-23 21:59:16 +0100) are available in the git repository at: git://git.denx.de/u-boot-coldfire.git master Alison Wang (2): ColdFire: Rename NANDFLASH_SIZE into CONFIG_NANDFLASH_SIZE for MCF537x ColdFire: Update the bitops for ColdFire platform arch/m68k/include/asm/bitops.h | 59 ++++++++++++++++++--------------------- include/configs/M5373EVB.h | 10 +++--- 2 files changed, 32 insertions(+), 37 deletions(-) Best Regards, Jason

1 0

[U-Boot] [STATUS] DEVELOPER's MEETING - Invitation
by Wolfgang Denk 29 Mar '12

29 Mar '12

Hi all! The poll http://www.doodle.com/6b9n3g4mnui73yai shows that meeting at the Libre Software Meeting (LSM) from 7th to 12th July in Geneva, Switzerland appears to be the best option we have at this moment. So let's do that! Let's have our first DEVELOPER's MEETING ... Please see http://2012.rmll.info/en for details of the context. If you are quick, you can submit a talk - see http://call.rmll.info/talk/new So far, I know of two U-Boot related talks that have been submitted / are in the process of being submitted: Wolfgang Denk: Minimizing boot times using U-Boot "Falcon" mode Marek Vasut: U-Boot Driver Model Not directly related to U-Boot, but still close: Detlev Zundel will talk about Real-Time with Xenomai on i.MX6. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Bei genauerem Hinsehen ist die Arbeit weniger langweilig als das Vergnügen. -- Charles Baudelaire

1 0

[U-Boot] POLL: DEVELOPER's MEETING
by Wolfgang Denk 29 Mar '12

29 Mar '12

Hello, thanks for all the feedback regarding a U-Boot Developer's Meeting. As I lost track of who said what, I have set up a poll at Doodle. The link to this poll is: http://www.doodle.com/6b9n3g4mnui73yai Share this link with all those who should cast their votes. Do not forget to cast your vote, too. I have set up 3 options for the event: 1) at the Libre Software Meeting (LSM) from 7th to 12th July in Geneva, Switzerland 2) at the Embedded Linux Conference Europe 2012 from 5th to 7th November in Barcelona, Spain or 3) at Fossdem 2013 from 8th to 10th February 2013 (???) Please vote with yes - if you are positively sure that you will attend the respective event in any case, even if no U-Boot meeting will take place there. (yes) - if you will come there if the U-Boot meeting will take place there, too. no - if you cannot attend at this time or place, but are interested in such an event in general. Please do not vote at all if you ar enot interested. Please also feel free to send me direct e-mail with suggestions for other opportunites we should consider. Thanks! Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de "In the face of entropy and nothingness, you kind of have to pretend it's not there if you want to keep writing good code." - Karl Lehenbauer

2 2

Re: [U-Boot] [PATCH v2] lsxl: add support for lschlv2 and lsxhl
by Michael Walle 29 Mar '12

29 Mar '12

Hi Prafulla, thanks for the review. >> +++ b/board/buffalo/lsxl/kwbimage-lsxhl.cfg > BTW: What is difference between them? if it is very small you can manage > it through c file. mh? arent these the values which end up in the head of an SPI image, the SoC bootstrap rom will execute? how can these be changed with a c file? I extracted these values from the original vendor supplied uboot binary / SPI dump. >> +/* >> + * Rescue mode >> + * >> + * Selected by holding the push button for 3 seconds, while powering on >> + * the device. >> + * >> + * These linkstations don't have a (populated) serial port. There is no >> + * way to access an (unmodified) board other than using the netconsole. >> If >> + * you want to recover from a bad environment setting or an empty > environment, >> + * you can do this only with a working network connection. Therefore, the >> + * following network configuration will be set when rescue mode is stared. >> + * Additionally, the bootsource is set to 'cli'. >> + */ >> +#define RESCUE_ETHADDR "02:00:01:00:00:00" >> +#define RESCUE_IPADDR "192.168.11.150" >> +#define RESCUE_NETMASK "255.255.255.0" >> +#define RESCUE_SERVERIP "192.168.11.1" > NAK, no hardcoding please. Unfortunately, this is not possible. As described in the comment above, you have to have a working network to use the netconsole. Also have a look at: http://lists.denx.de/pipermail/u-boot/2012-January/114547.html I removed the hardcoded values from the environment and put it into a special rescue mode, so it won't show up until the user is explicitly choosing that mode. I can understand, that hardcoded values are bad but in this case i cannot think of any other (easy and reliable) way to get access to a misconfigured linkstation. Do you have any other idea? again, the only interfaces you have are ethernet, one button, two (multiple color leds), one switch with three positions [and an usb port, only available on older linkstations]. >> +#define RESCUE_NCIP RESCUE_SERVERIP >> + >> +#ifndef CONFIG_ENV_OVERWRITE >> +# error "You need to set CONFIG_ENV_OVERWRITE" >> +#endif >> + >> +DECLARE_GLOBAL_DATA_PTR; >> + >> +int board_early_init_f(void) >> +{ >> + /* >> + * default gpio configuration >> + * There are maximum 64 gpios controlled through 2 sets of registers >> + * the below configuration configures mainly initial LED status + */ >> + kw_config_gpio(LSXL_OE_VAL_LOW, >> + LSXL_OE_VAL_HIGH, >> + LSXL_OE_LOW, LSXL_OE_HIGH); >> + >> + /* Multi-Purpose Pins Functionality configuration */ >> + u32 kwmpp_config[] = { >> + MPP0_SPI_SCn, >> + MPP1_SPI_MOSI, >> + MPP2_SPI_SCK, >> + MPP3_SPI_MISO, >> + MPP4_UART0_RXD, >> + MPP5_UART0_TXD, >> + MPP6_SYSRST_OUTn, >> + MPP7_GPO, >> + MPP8_GPIO, >> + MPP9_GPIO, >> + MPP10_GPO, >> + MPP11_GPIO, >> + MPP12_SD_CLK, >> + MPP13_SD_CMD, >> + MPP14_SD_D0, >> + MPP15_SD_D1, >> + MPP16_SD_D2, >> + MPP17_SD_D3, >> + MPP18_GPO, >> + MPP19_GPO, >> + MPP20_GE1_0, >> + MPP21_GE1_1, >> + MPP22_GE1_2, >> + MPP23_GE1_3, >> + MPP24_GE1_4, >> + MPP25_GE1_5, >> + MPP26_GE1_6, >> + MPP27_GE1_7, >> + MPP28_GPIO, >> + MPP29_GPIO, >> + MPP30_GE1_10, >> + MPP31_GE1_11, >> + MPP32_GE1_12, >> + MPP33_GE1_13, >> + MPP34_GPIO, >> + MPP35_GPIO, >> + MPP36_GPIO, >> + MPP37_GPIO, >> + MPP38_GPIO, >> + MPP39_GPIO, >> + MPP40_GPIO, >> + MPP41_GPIO, >> + MPP42_GPIO, >> + MPP43_GPIO, >> + MPP44_GPIO, >> + MPP45_GPIO, >> + MPP46_GPIO, >> + MPP47_GPIO, >> + MPP48_GPIO, >> + MPP49_GPIO, > are you using all there MFPs on your board, it's better to comment about GPIOs for their usage i guess i can only describe a subset of these gpios, as it is a proprietary board by linksys i have no documenation about ;) but i'll add the ones i know. >> --- a/boards.cfg >> +++ b/boards.cfg >> @@ -137,6 +137,9 @@ hawkboard_uart arm arm926ejs > da8xxevm davinci >> enbw_cmc arm arm926ejs enbw_cmc > enbw davinci >> calimain arm arm926ejs calimain > omicron davinci >> dns325 arm arm926ejs - >> d- > link kirkwood >> +lschlv2 arm arm926ejs lsxl > buffalo kirkwood lsxl:LSCHLV2 >> +lschlv2_ramboot arm arm926ejs lsxl > buffalo kirkwood > lsxl:LSCHLV2,SYS_RAMBOOT,SYS_TEXT_BASE=0x00700000 >> +lsxhl arm arm926ejs lsxl > Again, if the board is boot from RAM, you dont need kwbimage.cfg for that > particular board. mh? the lschlv2_ramboot is just for testing purposes. So you can try the bootloader without actually overwriting it in the boot flash. The actual images are the lschlv2 and lsxhl targets. I guess i should add a lsxhl_ramboot, too. There was no need for the latter because i have a jtag connector on my lsxhl (but not on the lschlv2). >> +#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage- > lschl.cfg >> +#define CONFIG_MACH_TYPE 3006 >> +#define CONFIG_SYS_TCLK 166666667 /* 166 MHz */ > No hardcoding, why you want to run kirkwood at 166? mh, is there any autodetection, i don't know? if i run it without the TCLK set to 166mhz the serial out is screwed up. FYI, the LS-CHLv2 is basically a stripped down version of the LS-XHL (running at TCLK=200MHz). I guess Linksys is running the CPU at 166MHz, although i couldn't find such a strapping in the manual. > Is the chip 6281/6282 or 6192? I'll have a look later. Don't have a board right now. -- michael

3 4