[U-Boot] [PATCH] mmc: dwmmc: mode change to 0644
Don't know why but, file permission was changed Signed-off-by: Minkyu Kang --- 0 files changed mode change 100755 => 100644 drivers/mmc/dw_mmc.c diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c old mode 100755 new mode 100644 -- 1.7.9.5 -- Thanks, Minkyu Kang. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 04/12] samsung: misc: move display logo function to misc.c file.
Dear Przemyslaw Marczak,
On 14/01/14 17:02, Przemyslaw Marczak wrote:
> Hello Jaehoon,
>
> On 01/14/2014 04:41 AM, Jaehoon Chung wrote:
>> Dear Przemyslaw,
>>
>> On 01/10/2014 11:31 PM, Przemyslaw Marczak wrote:
>>> board/samsung/common/misc.c:
>>> - move draw_logo() function from exynos_fb.c
>>> - add get_tizen_logo_info() function call removed from board files
>>>
>>> boards:
>>> - update board files
>>> - add CONFIG_MISC_INIT_R to Universal, Trats and Trats2
>>>
>>> Signed-off-by: Przemyslaw Marczak
>>> Tested-by: Hyungwon Hwang
>>> ---
>>> changes v2:
>>> - configs cleanup
>>> - add check logo address before display
>>>
>>> Changes v3:
>>> - none
>>>
>>> Changes v4:
>>> - none
>>>
>>> Changes v5:
>>> - none
>>>
>>> board/samsung/common/misc.c | 42
>>> ++
>>> board/samsung/trats/trats.c |3 ---
>>> board/samsung/trats2/trats2.c|4 ---
>>> board/samsung/universal_c210/universal.c |4 ---
>>> drivers/video/exynos_fb.c| 28
>>> include/configs/s5pc210_universal.h |3 +++
>>> include/configs/trats.h |3 +++
>>> include/configs/trats2.h |3 +++
>>> 8 files changed, 51 insertions(+), 39 deletions(-)
>>>
>>> diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
>>> index 3764d12..6188e29 100644
>>> --- a/board/samsung/common/misc.c
>>> +++ b/board/samsung/common/misc.c
>>> @@ -6,9 +6,51 @@
>>>*/
>>>
>>> #include
>>> +#include
>>> +#include
>>> +
>>> +#ifdef CONFIG_CMD_BMP
>>> +static void draw_logo(void)
>>> +{
>>> +int x, y;
>>> +ulong addr;
>>> +
>>> +#ifdef CONFIG_TIZEN
>>> +get_tizen_logo_info(&panel_info);
>>> +#else
>>> +return;
>> if CONFIG_TINZE didn't set, draw_logo should be just return, right?
>> Then I think this point could be changed more readable.
>>
>> #ifdef CONFIG_TIZEN
>> int x, y;
>> ulong addr;
>>
>> get_tizen_logo_info(...);
>>
>> add = panel_info.logo_addr;
>> ...
>> bmp_display(addr, x, y);
>> #endif
>>
>> how about?
>>
>> Best Regards,
>> Jaehoon Chung
>>
>>
>
> You know, this file is common for all Samsung platforms,and I think this
> function should not depends only on Tizen logo. In this case user can choose
> other logo just by adding function like "get_logo" instead of the return
> statement. I also think that there is need for some common function which
> allows set proper logo by board config, but maybe not in this patch set?
I agreed with you.
You said that "there is need for some common function which allows set proper
logo by board config".
At previous version of board files, you already have common function
(init_panel_info - even though this function is not for the logo but I think,
it's enough).
@@ -484,10 +484,6 @@ void init_panel_info(vidinfo_t *vid)
vid->resolution = HD_RESOLUTION;
vid->rgb_mode = MODE_RGB_P;
-#ifdef CONFIG_TIZEN
- get_tizen_logo_info(vid);
-#endif
-
/* for LD9040. */
vid->pclk_name = 1; /* MPLL */
vid->sclk_div = 1;
If you remove this change at each boards, then you don't have add ifdef
CONFIG_TIZEN at draw_logo function.
It can be split common stuffs and board specific stuffs efficiently.
How you think?
Thanks,
Minkyu Kang.
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/7] board:samsung:universal: add env variables describing platform
Hello Piotr, On 01/14/2014 08:59 AM, Piotr Wilczek wrote: This patch adds variables describing platform (soc, board, vendor) to default environment. Samsung's common misc imitialisation is enabled to provide additional board information in envs. Signed-off-by: Piotr Wilczek Signed-off-by: Kyungmin Park Cc: Przemyslaw Marczak --- include/configs/s5pc210_universal.h |5 + 1 file changed, 5 insertions(+) diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index d9e4c56..5e5f8e0 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -124,6 +124,11 @@ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_ENV_VARS_UBOOT_CONFIG +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + +#define CONFIG_MISC_INIT_R + You depends on my patch set and here we have a conflict in universal, trats and trats2. My patchset defines CONFIG_MISC_INIT_R for these three boards, so you can remove it from configs. #define CONFIG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x10;" \ Thank you, -- Przemyslaw Marczak Samsung R&D Institute Poland Samsung Electronics p.marc...@samsung.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/9] kmp204x: support for QRIO1 bootcounter
Hi Stefan,
On 01/14/2014 07:58 AM, Stefan Roese wrote:
> Hi Valentin,
>
> On 13.01.2014 17:29, Valentin Longchamp wrote:
>> From: Rainer Boschung
>>
>> - make use of the QRIO1 32bit register at 0x20 as bootcounter register
>> - check for BOOTCOUNT_MAGIC pattern when before bootcounter value is read
>>
>> Signed-off-by: Rainer Boschung
>> Signed-off-by: Valentin Longchamp
>> Acked-by: Valentin Longchamp
>> ---
>>
>> board/keymile/kmp204x/kmp204x.c | 15 +--
>> 1 file changed, 9 insertions(+), 6 deletions(-)
>>
>> diff --git a/board/keymile/kmp204x/kmp204x.c
>> b/board/keymile/kmp204x/kmp204x.c
>> index f02642a..b41929a 100644
>> --- a/board/keymile/kmp204x/kmp204x.c
>> +++ b/board/keymile/kmp204x/kmp204x.c
>> @@ -134,22 +134,25 @@ void qrio_prstcfg(u8 bit, u8 mode)
>> }
>>
>>
>> -#define BOOTCOUNT_OFF 0x12
>> +#define BOOTCOUNT_OFF 0x20
>>
>> void bootcount_store(ulong counter)
>> {
>> -u8 val;
>> void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
>>
>> -val = (counter <= 255) ? (u8)counter : 255;
>> -out_8(qrio_base + BOOTCOUNT_OFF, val);
>> +out_be32(qrio_base + BOOTCOUNT_OFF, counter);
>> }
>>
>> ulong bootcount_load(void)
>> {
>> -u8 val;
>> +u32 val;
>> void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
>> -val = in_8(qrio_base + BOOTCOUNT_OFF);
>> +val = in_be32(qrio_base + BOOTCOUNT_OFF + 4);
>> +
>> +if (val == BOOTCOUNT_MAGIC)
>> +val = in_be32(qrio_base + BOOTCOUNT_OFF);
>> +else
>> +val = 0;
>> return val;
>> }
>
> Can't you just use the common bootcount driver
> (drivers/bootcount/bootcount.c) instead? Should be easy. Just define
> this in your config header:
>
> #define CONFIG_BOOTCOUNT_LIMIT
> #define CONFIG_SYS_BOOTCOUNT_ADDR (CONFIG_SYS_QRIO_BASE + 0x20)
Thanks for the input, I will use this.
Best regards
Valentin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] net/bootp: add CONFIG_BOOTP_BOOTFILE
In some cases the TFTP server provides a bootfile name, which
does not expects our requirements. Make it possible to
not store the TFTP provided bootfile in the environment.
Signed-off-by: Christian Gmeiner
---
README |4
net/bootp.c |2 ++
2 files changed, 6 insertions(+)
diff --git a/README b/README
index aea82be..dc5c153 100644
--- a/README
+++ b/README
@@ -1921,6 +1921,10 @@ CBFS (Coreboot Filesystem) support
CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip
environment variable, not the BOOTP server.
+ CONFIG_BOOTP_BOOTFILE - TFTP bootfile will be the bootfile
+ environment variable, not the filename provided by
+ BOOTP server.
+
CONFIG_BOOTP_MAY_FAIL - If the DHCP server is not found
after the configured retry count, the call will fail
instead of starting over. This can be used to fail over
diff --git a/net/bootp.c b/net/bootp.c
index 4300f1c..5e76827 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -106,6 +106,7 @@ static void BootpCopyNetParams(struct Bootp_t *bp)
memcpy(NetServerEther, ((struct ethernet_hdr *)NetRxPacket)->et_src, 6);
#endif
NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
+#if !defined(CONFIG_BOOTP_BOOTFILE)
if (strlen(bp->bp_file) > 0)
copy_filename(BootFile, bp->bp_file, sizeof(BootFile));
@@ -117,6 +118,7 @@ static void BootpCopyNetParams(struct Bootp_t *bp)
*/
if (*BootFile)
setenv("bootfile", BootFile);
+#endif
}
static int truncate_sz(const char *name, int maxlen, int curlen)
--
1.7.10.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] board:universal: fix i2c adapter
Hi, On 01/14/2014 08:15 AM, Piotr Wilczek wrote: Universal uses only one adapter I2C_0. Signed-off-by: Piotr Wilczek Signed-off-by: Kyungmin Park --- board/samsung/universal_c210/universal.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 54d0e1e..3feef3f 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -49,7 +49,7 @@ int power_init_board(void) * For PMIC the I2C bus is named as I2C5, but it is connected * to logical I2C adapter 0 */ - ret = pmic_init(I2C_5); + ret = pmic_init(I2C_0); if (ret) return ret; Acked-by: Przemyslaw Marczak Thank you, -- Przemyslaw Marczak Samsung R&D Institute Poland Samsung Electronics p.marc...@samsung.com ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/2] mini2440: remove board support
Hi Minkyu, On Tue, 14 Jan 2014 09:51:48 +0900, Minkyu Kang wrote: > On 14/01/14 05:06, Albert ARIBAUD wrote: > > Signed-off-by: Albert ARIBAUD > > --- > > board/friendlyarm/mini2440/Makefile | 8 -- > > board/friendlyarm/mini2440/mini2440.c | 118 > > board/friendlyarm/mini2440/mini2440.h | 144 > > -- > > boards.cfg| 1 - > > doc/README.mini2440 | 28 --- > > doc/README.scrapyard | 5 +- > > 6 files changed, 3 insertions(+), 301 deletions(-) > > delete mode 100644 board/friendlyarm/mini2440/Makefile > > delete mode 100644 board/friendlyarm/mini2440/mini2440.c > > delete mode 100644 board/friendlyarm/mini2440/mini2440.h > > delete mode 100644 doc/README.mini2440 > > > > Acked-by: Minkyu Kang > > Thanks, > Minkyu Kang. > Applied to u-boot-arm/master, thanks! Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] mx1ads: remove board support
Hi Stefano,
On Mon, 13 Jan 2014 23:15:48 +0100, Stefano Babic
wrote:
>
>
> On 13/01/2014 21:06, Albert ARIBAUD wrote:
> > Signed-off-by: Albert ARIBAUD
> > ---
> > board/mx1ads/Makefile| 16 ---
> > board/mx1ads/lowlevel_init.S | 68 --
> > board/mx1ads/mx1ads.c| 178 -
> > board/mx1ads/syncflash.c | 307
> > ---
> > boards.cfg | 1 -
> > doc/README.scrapyard | 1 +
> > include/configs/mx1ads.h | 163 ---
> > 7 files changed, 1 insertion(+), 733 deletions(-)
> > delete mode 100644 board/mx1ads/Makefile
> > delete mode 100644 board/mx1ads/lowlevel_init.S
> > delete mode 100644 board/mx1ads/mx1ads.c
> > delete mode 100644 board/mx1ads/syncflash.c
> > delete mode 100644 include/configs/mx1ads.h
> >
> > diff --git a/board/mx1ads/Makefile b/board/mx1ads/Makefile
> > deleted file mode 100644
> > index 6dfd18e..000
> > --- a/board/mx1ads/Makefile
> > +++ /dev/null
> > @@ -1,16 +0,0 @@
> > -#
> > -# board/mx1ads/Makefile
> > -#
> > -# (C) Copyright 2006
> > -# Wolfgang Denk, DENX Software Engineering, w...@denx.de.
> > -#
> > -# (c) Copyright 2004
> > -# Techware Information Technology, Inc.
> > -# http://www.techware.com.tw/
> > -#
> > -# Ming-Len Wu
> > -#
> > -# SPDX-License-Identifier: GPL-2.0+
> > -
> > -obj-y := mx1ads.o syncflash.o
> > -obj-y += lowlevel_init.o
> > diff --git a/board/mx1ads/lowlevel_init.S b/board/mx1ads/lowlevel_init.S
> > deleted file mode 100644
> > index d1e472a..000
> > --- a/board/mx1ads/lowlevel_init.S
> > +++ /dev/null
> > @@ -1,68 +0,0 @@
> > -/*
> > - * board/mx1ads/lowlevel_init.S
> > - *
> > - * (c) Copyright 2004
> > - * Techware Information Technology, Inc.
> > - * http://www.techware.com.tw/
> > - *
> > - * Ming-Len Wu
> > - *
> > - * SPDX-License-Identifier:GPL-2.0+
> > - */
> > -
> > -#include
> > -#include
> > -
> > -#define SDCTL0 0x221000
> > -#define SDCTL1 0x221004
> > -
> > -
> > -_TEXT_BASE:
> > - .word CONFIG_SYS_TEXT_BASE
> > -
> > -.globl lowlevel_init
> > -lowlevel_init:
> > -/* memory controller init */
> > -
> > - ldr r1, =SDCTL0
> > -
> > -/* Set Precharge Command */
> > -
> > - ldr r3, =0x92120200
> > -/* ldr r3, =0x92120251
> > -*/
> > - str r3, [r1]
> > -
> > -/* Issue Precharge All Commad */
> > - ldr r3, =0x820
> > - ldr r2, [r3]
> > -
> > -/* Set AutoRefresh Command */
> > - ldr r3, =0xA2120200
> > - str r3, [r1]
> > -
> > -/* Issue AutoRefresh Command */
> > - ldr r3, =0x800
> > - ldr r2, [r3]
> > - ldr r2, [r3]
> > - ldr r2, [r3]
> > - ldr r2, [r3]
> > - ldr r2, [r3]
> > - ldr r2, [r3]
> > - ldr r2, [r3]
> > - ldr r2, [r3]
> > -
> > -/* Set Mode Register */
> > - ldr r3, =0xB2120200
> > - str r3, [r1]
> > -
> > -/* Issue Mode Register Command */
> > - ldr r3, =0x08111800/* Mode Register Value */
> > - ldr r2, [r3]
> > -
> > -/* Set Normal Mode */
> > - ldr r3, =0x82124200
> > - str r3, [r1]
> > -
> > -/* everything is fine now */
> > - mov pc, lr
> > diff --git a/board/mx1ads/mx1ads.c b/board/mx1ads/mx1ads.c
> > deleted file mode 100644
> > index 4266048..000
> > --- a/board/mx1ads/mx1ads.c
> > +++ /dev/null
> > @@ -1,178 +0,0 @@
> > -/*
> > - * board/mx1ads/mx1ads.c
> > - *
> > - * (c) Copyright 2004
> > - * Techware Information Technology, Inc.
> > - * http://www.techware.com.tw/
> > - *
> > - * Ming-Len Wu
> > - *
> > - * SPDX-License-Identifier:GPL-2.0+
> > - */
> > -
> > -#include
> > -#include
> > -/*#include */
> > -#include
> > -#include
> > -
> > -DECLARE_GLOBAL_DATA_PTR;
> > -
> > -#define FCLK_SPEED 1
> > -
> > -#if FCLK_SPEED==0 /* Fout = 203MHz, Fin = 12MHz for Audio */
> > -#define M_MDIV 0xC3
> > -#define M_PDIV 0x4
> > -#define M_SDIV 0x1
> > -#elif FCLK_SPEED==1/* Fout = 202.8MHz */
> > -#define M_MDIV 0xA1
> > -#define M_PDIV 0x3
> > -#define M_SDIV 0x1
> > -#endif
> > -
> > -#define USB_CLOCK 1
> > -
> > -#if USB_CLOCK==0
> > -#define U_M_MDIV 0xA1
> > -#define U_M_PDIV 0x3
> > -#define U_M_SDIV 0x1
> > -#elif USB_CLOCK==1
> > -#define U_M_MDIV 0x48
> > -#define U_M_PDIV 0x3
> > -#define U_M_SDIV 0x2
> > -#endif
> > -
> > -#if 0
> > -
> > -static inline void delay (unsigned long loops)
> > -{
> > - __asm__ volatile ("1:\n"
> > - "subs %0, %1, #1\n"
> > - "bne 1b":"=r" (loops):"0" (loops));
> > -}
> > -
> > -#endif
> > -
> > -/*
> > - * Miscellaneous platform dependent initialisations
> > - */
> > -
> > -void SetAsynchMode (void)
> > -{
> > - __asm__ ("mrc p15,0,r0,c1,c0,0 \n"
> > -"mov r2, #0xC000 \n"
> > -"orr r0,r2,r0 \n" "mcr p15,0,r0,c1
Re: [U-Boot] [PATCH v5 04/12] samsung: misc: move display logo function to misc.c file.
Hello Jaehoon,
On 01/14/2014 04:41 AM, Jaehoon Chung wrote:
Dear Przemyslaw,
On 01/10/2014 11:31 PM, Przemyslaw Marczak wrote:
board/samsung/common/misc.c:
- move draw_logo() function from exynos_fb.c
- add get_tizen_logo_info() function call removed from board files
boards:
- update board files
- add CONFIG_MISC_INIT_R to Universal, Trats and Trats2
Signed-off-by: Przemyslaw Marczak
Tested-by: Hyungwon Hwang
---
changes v2:
- configs cleanup
- add check logo address before display
Changes v3:
- none
Changes v4:
- none
Changes v5:
- none
board/samsung/common/misc.c | 42 ++
board/samsung/trats/trats.c |3 ---
board/samsung/trats2/trats2.c|4 ---
board/samsung/universal_c210/universal.c |4 ---
drivers/video/exynos_fb.c| 28
include/configs/s5pc210_universal.h |3 +++
include/configs/trats.h |3 +++
include/configs/trats2.h |3 +++
8 files changed, 51 insertions(+), 39 deletions(-)
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 3764d12..6188e29 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -6,9 +6,51 @@
*/
#include
+#include
+#include
+
+#ifdef CONFIG_CMD_BMP
+static void draw_logo(void)
+{
+ int x, y;
+ ulong addr;
+
+#ifdef CONFIG_TIZEN
+ get_tizen_logo_info(&panel_info);
+#else
+ return;
if CONFIG_TINZE didn't set, draw_logo should be just return, right?
Then I think this point could be changed more readable.
#ifdef CONFIG_TIZEN
int x, y;
ulong addr;
get_tizen_logo_info(...);
add = panel_info.logo_addr;
...
bmp_display(addr, x, y);
#endif
how about?
Best Regards,
Jaehoon Chung
You know, this file is common for all Samsung platforms, and I think
this function should not depends only on Tizen logo. In this case user
can choose other logo just by adding function like "get_logo" instead of
the return statement. I also think that there is need for some common
function which allows set proper logo by board config, but maybe not in
this patch set?
Thank you,
--
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marc...@samsung.com
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/7] arm:s5pc110: add cpu revision
This patch adds s5p_cpu_rev.
Signed-off-by: Piotr Wilczek
Signed-off-by: Kyungmin Park
---
arch/arm/include/asm/arch-s5pc1xx/cpu.h |7 +++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/include/asm/arch-s5pc1xx/cpu.h
b/arch/arm/include/asm/arch-s5pc1xx/cpu.h
index 4fc5a0c..5ae5c87 100644
--- a/arch/arm/include/asm/arch-s5pc1xx/cpu.h
+++ b/arch/arm/include/asm/arch-s5pc1xx/cpu.h
@@ -51,10 +51,17 @@
#include
/* CPU detection macros */
extern unsigned int s5p_cpu_id;
+extern unsigned int s5p_cpu_rev;
+
+static inline int s5p_get_cpu_rev(void)
+{
+ return s5p_cpu_rev;
+}
static inline void s5p_set_cpu_id(void)
{
s5p_cpu_id = readl(S5PC100_PRO_ID);
+ s5p_cpu_rev = s5p_cpu_id & 0x00FF;
s5p_cpu_id = 0xC000 | ((s5p_cpu_id & 0x00FFF000) >> 12);
}
--
1.7.9.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 4/7] board:samsung:goni: add env variables describing platform
This patch adds variables describing platform (soc, board, vendor)
to default environment.
Samsung's common misc imitialisation is enabled to provide
additional board information in envs.
Signed-off-by: Piotr Wilczek
Signed-off-by: Kyungmin Park
Cc: Mateusz Zalega
---
board/samsung/goni/goni.c |5 +
include/configs/s5p_goni.h |4
2 files changed, 9 insertions(+)
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 366f648..fb0435e 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -17,6 +17,11 @@ DECLARE_GLOBAL_DATA_PTR;
static struct s5pc110_gpio *s5pc110_gpio;
+u32 get_board_rev(void)
+{
+ return 0;
+}
+
int board_init(void)
{
/* Set Initial global variables */
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 0590d20..82a8a8c 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -113,8 +113,12 @@
#define CONFIG_UBIFS_OPTION"rootflags=bulk_read,no_chk_data_crc"
+#define CONFIG_MISC_INIT_R
+
#define CONFIG_ENV_OVERWRITE
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_UPDATEB \
"updatek=" \
--
1.7.9.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 5/7] board:samsung:universal: add env variables describing platform
This patch adds variables describing platform (soc, board, vendor) to default environment. Samsung's common misc imitialisation is enabled to provide additional board information in envs. Signed-off-by: Piotr Wilczek Signed-off-by: Kyungmin Park Cc: Przemyslaw Marczak --- include/configs/s5pc210_universal.h |5 + 1 file changed, 5 insertions(+) diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index d9e4c56..5e5f8e0 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -124,6 +124,11 @@ #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_ENV_VARS_UBOOT_CONFIG +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + +#define CONFIG_MISC_INIT_R + #define CONFIG_EXTRA_ENV_SETTINGS \ "updateb=" \ "onenand erase 0x0 0x10;" \ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 7/7] board:samsung:trats2: enable boot with appended and separated DTB
This patch adds variables describing platform (soc, board, vendor)
to default environment and Samsung's common misc initialisation
to provide additional board information in envs.
This patch modifies envs to enable dual kernel boot
- with separated DTB if the DTB file is loaded successfully;
- with DTB apppended to uImage if DTB file is not found;
This is neccesssary for backward compatibilty.
Signed-off-by: Piotr Wilczek
Signed-off-by: Kyungmin Park
---
include/configs/trats2.h | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 7dfbe98..9d1b461 100644
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -150,6 +150,9 @@
#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
/* Tizen - partitions definitions */
#define PARTS_CSA "csa"
#define PARTS_BOOT "boot"
@@ -177,7 +180,11 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootk=" \
- "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
+ "run loaduimage;" \
+ "if run loaddtb; then " \
+ "bootm 0x40007FC0 - ${fdtaddr};" \
+ "fi;" \
+ "bootm 0x40007FC0;\0" \
"updatemmc=" \
"mmc boot 0 1 1 1; mmc write 0x42008000 0 0x200;" \
"mmc boot 0 1 1 0\0" \
@@ -191,7 +198,7 @@
"mmcboot=" \
"setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
"${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
- "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
+ "run bootk\0" \
"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
"boottrace=setenv opts initcall_debug; run bootcmd\0" \
"verify=n\0" \
@@ -232,7 +239,6 @@
"setenv spl_imgaddr;" \
"setenv spl_addr_tmp;\0" \
"fdtaddr=4080\0" \
- "fdtfile=exynos4412-trats2.dtb\0"
/*
* Miscellaneous configurable options
@@ -272,6 +278,7 @@
#define CONFIG_EFI_PARTITION
#define CONFIG_PARTITION_UUIDS
+#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_EARLY_INIT_F
/* I2C */
--
1.7.9.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 6/7] board:samsung:trats: enable boot with appended and separated DTB
This patch adds variables describing platform (soc, board, vendor)
to default environment and Samsung's common misc initialisation
to provide additional board information in envs.
This patch modifies envs to enable dual kernel boot
- with separated DTB if the DTB file is loaded successfully;
- with DTB apppended to uImage if DTB file is not found;
This is neccesssary for backward compatibilty.
Signed-off-by: Piotr Wilczek
Signed-off-by: Kyungmin Park
Cc: Lukasz Majewski
---
include/configs/trats.h | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/configs/trats.h b/include/configs/trats.h
index 0877142..71b1a4e 100644
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -148,9 +148,16 @@
#define CONFIG_SYS_CONSOLE_INFO_QUIET
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
#define CONFIG_EXTRA_ENV_SETTINGS \
"bootk=" \
- "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
+ "run loaduimage;" \
+ "if run loaddtb; then " \
+ "bootm 0x40007FC0 - ${fdtaddr};" \
+ "fi;" \
+ "bootm 0x40007FC0;\0" \
"updatemmc=" \
"mmc boot 0 1 1 1; mmc write 0 0x42008000 0 0x200;" \
"mmc boot 0 1 1 0\0" \
@@ -173,7 +180,7 @@
"mmcboot=" \
"setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
"${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \
- "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \
+ "run loaddtb; run bootk\0" \
"bootchart=setenv opts init=/sbin/bootchartd; run bootcmd\0" \
"boottrace=setenv opts initcall_debug; run bootcmd\0" \
"mmcoops=mmc read 0 0x4000 0x40 8; md 0x4000 0x400\0" \
@@ -212,7 +219,6 @@
"setenv spl_imgaddr;" \
"setenv spl_addr_tmp;\0" \
"fdtaddr=4080\0" \
- "fdtfile=exynos4210-trats.dtb\0"
/* Miscellaneous configurable options */
@@ -254,6 +260,8 @@
#define CONFIG_DOS_PARTITION
#define CONFIG_EFI_PARTITION
+#define CONFIG_MISC_INIT_R
+
/* EXT4 */
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
--
1.7.9.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 3/7] board:samsung:common: set envs with board unified information
This patch enables to set envs that describe board information.
The following envs are set (but not saved): soc_id, soc_rev, board_rev.
Based on this information, 'fdtaddr' env is set (not saved) as:
fdtaddr=${soc_family}${soc_id}-${board}.dtb
Signed-off-by: Piotr Wilczek
Signed-off-by: Kyungmin Park
---
board/samsung/common/misc.c | 29 +
1 file changed, 29 insertions(+)
diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c
index 3764d12..2d81df9 100644
--- a/board/samsung/common/misc.c
+++ b/board/samsung/common/misc.c
@@ -7,8 +7,37 @@
#include
+extern u32 get_board_rev(void);
+
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+void set_board_info(void)
+{
+ char info[64];
+
+ snprintf(info, ARRAY_SIZE(info), "%d.%d", s5p_cpu_rev & 0x0f,
+(s5p_cpu_rev & 0xf0) >> 0x04);
+ setenv("soc_rev", info);
+
+ snprintf(info, ARRAY_SIZE(info), "%x", s5p_cpu_id);
+ setenv("soc_id", info);
+
+ snprintf(info, ARRAY_SIZE(info), "%x", get_board_rev());
+ setenv("board_rev", info);
+
+#ifdef CONFIG_OF_LIBFDT
+ snprintf(info, ARRAY_SIZE(info), "%s%x-%s.dtb",
+CONFIG_SYS_SOC, s5p_cpu_id, CONFIG_SYS_BOARD);
+ setenv("fdtfile", info);
+#endif
+}
+#endif
+
/* Common for Samsung boards */
int misc_init_r(void)
{
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ set_board_info();
+#endif
+
return 0;
}
--
1.7.9.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/7] arm:exynos: add cpu revision
This patch enables to read cpu revision on Exynos CPU.
Signed-off-by: Piotr Wilczek
Signed-off-by: Kyungmin Park
---
arch/arm/include/asm/arch-exynos/cpu.h |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/arch-exynos/cpu.h
b/arch/arm/include/asm/arch-exynos/cpu.h
index 573f755..bccce63 100644
--- a/arch/arm/include/asm/arch-exynos/cpu.h
+++ b/arch/arm/include/asm/arch-exynos/cpu.h
@@ -185,9 +185,11 @@ static inline int s5p_get_cpu_rev(void)
static inline void s5p_set_cpu_id(void)
{
- unsigned int pro_id = (readl(EXYNOS4_PRO_ID) & 0x00FFF000) >> 12;
+ unsigned int pro_id = readl(EXYNOS4_PRO_ID);
+ unsigned int cpu_id = (pro_id & 0x00FFF000) >> 12;
+ unsigned int cpu_rev = pro_id & 0x00FF;
- switch (pro_id) {
+ switch (cpu_id) {
case 0x200:
/* Exynos4210 EVT0 */
s5p_cpu_id = 0x4210;
@@ -196,10 +198,12 @@ static inline void s5p_set_cpu_id(void)
case 0x210:
/* Exynos4210 EVT1 */
s5p_cpu_id = 0x4210;
+ s5p_cpu_rev = cpu_rev;
break;
case 0x412:
/* Exynos4412 */
s5p_cpu_id = 0x4412;
+ s5p_cpu_rev = cpu_rev;
break;
case 0x520:
/* Exynos5250 */
--
1.7.9.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/7] arm: add runtime envs describing build configuration
This patchset adds runtime variables for Samsung boards that describe build configuration (arch, soc, board, vendor). Additionally, more envs describing platform (soc and board revision) are added to Samsung common code. For boards Trats and Trats2, based on the added envs, 'fdtaddr' env is set and dual kernel boot is enabled: - with separated DTB if the DTB file is loaded successfully; - with DTB apppended to uImage if DTB file is not found; This is neccesssary for backward compatibilty. Piotr Wilczek (7): arm:exynos: add cpu revision arm:s5pc110: add cpu revision board:samsung:common: set envs with board unified information board:samsung:goni: add env variables describing platform board:samsung:universal: add env variables describing platform board:samsung:trats: enable boot with appended and separated DTB board:samsung:trats2: enable boot with appended and separated DTB arch/arm/include/asm/arch-exynos/cpu.h |8 ++-- arch/arm/include/asm/arch-s5pc1xx/cpu.h |7 +++ board/samsung/common/misc.c | 29 + board/samsung/goni/goni.c |5 + include/configs/s5p_goni.h |4 include/configs/s5pc210_universal.h |5 + include/configs/trats.h | 14 +++--- include/configs/trats2.h| 13 ++--- 8 files changed, 77 insertions(+), 8 deletions(-) -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
