* [U-Boot] [PATCH v3 0/5] arm, am33xx: update for the am33xx based siemens boards
@ 2013-11-04 13:04 Heiko Schocher
2013-11-04 13:04 ` [U-Boot] [PATCH v3 1/5] bootcount: store bootcount var in environment Heiko Schocher
` (4 more replies)
0 siblings, 5 replies; 16+ messages in thread
From: Heiko Schocher @ 2013-11-04 13:04 UTC (permalink / raw)
To: u-boot
Patch 1 introduces bootcount support for the 3 siemens boards. As there
is no other possibility on this boards, the bootcounter is stored in the
environment. To prevent a "saveenv" on all reboots, a "upgrade_available"
U-Boot Environment variable is introduced.
Patch 2 makes the enabling of the RTC32K OSC configurable, as
on the dxr2 board it is not used, and
http://www.denx.de/wiki/view/U-Boot/DesignPrinciples#2_Keep_it_Fast
says not enable things not used ...
Patch 3 adds an option to set the iSerialNumber board specific, which
is used on the 3 siemens boards.
Patch 4 adds an option to set the bcdDevice number board specific, which
is used on the 3 siemens boards.
Patch 5 contains a lot of updates for the siemens boards, see commit
message for detailed information.
already posted patches on which this patchserie is based:
[U-Boot,v4] i2c, omap24xx: convert driver to new mutlibus/mutliadapter framework
http://patchwork.ozlabs.org/patch/285390/
[U-Boot] net, phy: fix AR8031 phy_mask
http://patchwork.ozlabs.org/patch/276944/
[U-Boot,2/3] net, phy: fix NULL pointer deference
http://patchwork.ozlabs.org/patch/272797/
changes for v2:
- added comments from Lukasz Majewski for the USB DFU related parts
changes for v3:
- rebase against current u-boot/master
509dca7a11aad394d781a9d31a7bfa6692562741
Heiko Schocher (4):
bootcount: store bootcount var in environment
arm, am33x: make RTC32K OSC enable configurable
usb, g_dnl: make iSerialNumber board configurable
usb, g_dnl: make bcdDevice value configurable
Samuel Egli (1):
arm, am335x: update for the siemens boards
README | 19 ++++
arch/arm/cpu/armv7/am33xx/board.c | 4 +
board/siemens/common/factoryset.c | 24 ++++-
board/siemens/common/factoryset.h | 2 +
board/siemens/dxr2/board.c | 11 +--
board/siemens/dxr2/board.h | 9 +-
board/siemens/dxr2/mux.c | 158 +++++++++++++++++++++++++++++++++
board/siemens/pxm2/board.c | 3 +-
board/siemens/rut/board.c | 51 +++++++++--
drivers/bootcount/Makefile | 1 +
drivers/bootcount/bootcount_env.c | 29 ++++++
drivers/usb/gadget/g_dnl.c | 43 ++++++++-
include/configs/dxr2.h | 13 ++-
include/configs/pxm2.h | 7 +-
include/configs/rut.h | 10 ++-
include/configs/siemens-am33x-common.h | 69 ++++++++++----
include/configs/ti_am335x_common.h | 1 +
include/g_dnl.h | 1 +
18 files changed, 399 insertions(+), 56 deletions(-)
create mode 100644 drivers/bootcount/bootcount_env.c
Cc: Tom Rini <trini@ti.com>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Samuel Egli <samuel.egli@siemens.com>
Cc: Pascal Bach <pascal.bach@siemens.com>
Cc: Roger Meier <r.meier@siemens.com>
Cc: Matthias Michel <matthias.michel@siemens.com>
--
1.8.3.1
^ permalink raw reply [flat|nested] 16+ messages in thread* [U-Boot] [PATCH v3 1/5] bootcount: store bootcount var in environment 2013-11-04 13:04 [U-Boot] [PATCH v3 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher @ 2013-11-04 13:04 ` Heiko Schocher 2013-11-12 14:52 ` [U-Boot] [U-Boot, v3, " Tom Rini 2013-11-04 13:05 ` [U-Boot] [PATCH v3 2/5] arm, am33x: make RTC32K OSC enable configurable Heiko Schocher ` (3 subsequent siblings) 4 siblings, 1 reply; 16+ messages in thread From: Heiko Schocher @ 2013-11-04 13:04 UTC (permalink / raw) To: u-boot If no softreset save registers are found on the hardware "bootcount" is stored in the environment. To prevent a saveenv on all reboots, the environment variable "upgrade_available" is introduced. If "upgrade_available" is 0, "bootcount" is always 0 therefore no need to save the environment on u-boot boot, if "upgrade_available" is 1 "bootcount" is incremented in the environment and environment gets written on u-boot start. So the Userspace Applikation must set the "upgrade_available" and "bootcount" variable to 0 (for example with fw_setenv), if a boot was successfully. Signed-off-by: Heiko Schocher <hs@denx.de> --- - changes for v3 rebase against current u-boot/master 509dca7a11aad394d781a9d31a7bfa6692562741 - changes for v2 none --- README | 16 ++++++++++++++++ drivers/bootcount/Makefile | 1 + drivers/bootcount/bootcount_env.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 drivers/bootcount/bootcount_env.c diff --git a/README b/README index d06e7a0..1aeae7e 100644 --- a/README +++ b/README @@ -784,6 +784,22 @@ The following options need to be configured: as a convenience, when switching between booting from RAM and NFS. +- Bootcount: + CONFIG_BOOTCOUNT_LIMIT + Implements a mechanism for detecting a repeating reboot + cycle, see: + http://www.denx.de/wiki/view/DULG/UBootBootCountLimit + + CONFIG_BOOTCOUNT_ENV + If no softreset save registers are found on the hardware + "bootcount" is stored in the environment. To prevent a + saveenv on all reboots, the environment variable + "upgrade_available" is used. If "upgrade_available" is + 0, "bootcount" is always 0, if "upgrade_available" is + 1 "bootcount" is incremented in the environment. + So the Userspace Applikation must set the "upgrade_available" + and "bootcount" variable to 0, if a boot was successfully. + - Pre-Boot Commands: CONFIG_PREBOOT diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile index 2b517b6..8ec0423 100644 --- a/drivers/bootcount/Makefile +++ b/drivers/bootcount/Makefile @@ -11,6 +11,7 @@ COBJS-$(CONFIG_AT91SAM9XE) += bootcount_at91.o COBJS-$(CONFIG_BLACKFIN) += bootcount_blackfin.o COBJS-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o COBJS-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o +COBJS-$(CONFIG_BOOTCOUNT_ENV) += bootcount_env.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/bootcount/bootcount_env.c b/drivers/bootcount/bootcount_env.c new file mode 100644 index 0000000..2d6e8db --- /dev/null +++ b/drivers/bootcount/bootcount_env.c @@ -0,0 +1,29 @@ +/* + * (C) Copyright 2013 + * Heiko Schocher, DENX Software Engineering, hs at denx.de. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> + +void bootcount_store(ulong a) +{ + int upgrade_available = getenv_ulong("upgrade_available", 10, 0); + + if (upgrade_available) { + setenv_ulong("bootcount", a); + saveenv(); + } +} + +ulong bootcount_load(void) +{ + int upgrade_available = getenv_ulong("upgrade_available", 10, 0); + ulong val = 0; + + if (upgrade_available) + val = getenv_ulong("bootcount", 10, 0); + + return val; +} -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 1/5] bootcount: store bootcount var in environment 2013-11-04 13:04 ` [U-Boot] [PATCH v3 1/5] bootcount: store bootcount var in environment Heiko Schocher @ 2013-11-12 14:52 ` Tom Rini 0 siblings, 0 replies; 16+ messages in thread From: Tom Rini @ 2013-11-12 14:52 UTC (permalink / raw) To: u-boot On Mon, Nov 04, 2013 at 02:04:59PM +0100, Heiko Schocher wrote: > If no softreset save registers are found on the hardware > "bootcount" is stored in the environment. To prevent a > saveenv on all reboots, the environment variable > "upgrade_available" is introduced. If "upgrade_available" is > 0, "bootcount" is always 0 therefore no need to save the > environment on u-boot boot, if "upgrade_available" is 1 "bootcount" > is incremented in the environment and environment gets written > on u-boot start. > So the Userspace Applikation must set the "upgrade_available" > and "bootcount" variable to 0 (for example with fw_setenv), > if a boot was successfully. > > Signed-off-by: Heiko Schocher <hs@denx.de> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131112/c1103d38/attachment.pgp> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 2/5] arm, am33x: make RTC32K OSC enable configurable 2013-11-04 13:04 [U-Boot] [PATCH v3 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher 2013-11-04 13:04 ` [U-Boot] [PATCH v3 1/5] bootcount: store bootcount var in environment Heiko Schocher @ 2013-11-04 13:05 ` Heiko Schocher 2013-11-12 14:52 ` [U-Boot] [U-Boot, v3, " Tom Rini 2013-11-04 13:05 ` [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable Heiko Schocher ` (2 subsequent siblings) 4 siblings, 1 reply; 16+ messages in thread From: Heiko Schocher @ 2013-11-04 13:05 UTC (permalink / raw) To: u-boot As http://www.denx.de/wiki/view/U-Boot/DesignPrinciples#2_Keep_it_Fast states: "Initialize devices only when they are needed within U-Boot" enable the RTC32K OSC only, if CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is enabled. Enable this in ti_am335x_common.h, so all boards in mainline should work as before. Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Tom Rini <trini@ti.com> --- On the dxr2 board the RTC32K_OSC it is not used, so disable it for this board, done in the 5th patch of this patchserie "arm-am335x-update-for-the-siemens-boards" - changes for v3 rebase against current u-boot/master 509dca7a11aad394d781a9d31a7bfa6692562741 - changes for v2 none --- README | 3 +++ arch/arm/cpu/armv7/am33xx/board.c | 4 ++++ include/configs/ti_am335x_common.h | 1 + 3 files changed, 8 insertions(+) diff --git a/README b/README index 1aeae7e..5fb835f 100644 --- a/README +++ b/README @@ -4325,6 +4325,9 @@ Low Level (hardware related) configuration options: NOTE : currently only supported on AM335x platforms. +- CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC: + Enables the RTC32K OSC on AM33xx based plattforms + Freescale QE/FMAN Firmware Support: ----------------------------------- diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index a31bf40..7465ec5 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -148,6 +148,7 @@ __weak void am33xx_spl_board_init(void) do_setup_dpll(&dpll_mpu_regs, &dpll_mpu_opp100); } +#if defined(CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC) static void rtc32k_enable(void) { struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE; @@ -163,6 +164,7 @@ static void rtc32k_enable(void) /* Enable the RTC 32K OSC by setting bits 3 and 6. */ writel((1 << 3) | (1 << 6), &rtc->osc); } +#endif static void uart_soft_reset(void) { @@ -231,8 +233,10 @@ void s_init(void) #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT) prcm_init(); set_mux_conf_regs(); +#if defined(CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC) /* Enable RTC32K clock */ rtc32k_enable(); +#endif sdram_init(); #endif } diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h index d2e34ae..3441b0a 100644 --- a/include/configs/ti_am335x_common.h +++ b/include/configs/ti_am335x_common.h @@ -18,6 +18,7 @@ #define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ #define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ +#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #include <asm/arch/omap.h> -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 2/5] arm, am33x: make RTC32K OSC enable configurable 2013-11-04 13:05 ` [U-Boot] [PATCH v3 2/5] arm, am33x: make RTC32K OSC enable configurable Heiko Schocher @ 2013-11-12 14:52 ` Tom Rini 0 siblings, 0 replies; 16+ messages in thread From: Tom Rini @ 2013-11-12 14:52 UTC (permalink / raw) To: u-boot On Mon, Nov 04, 2013 at 02:05:00PM +0100, Heiko Schocher wrote: > As > http://www.denx.de/wiki/view/U-Boot/DesignPrinciples#2_Keep_it_Fast > states: > "Initialize devices only when they are needed within U-Boot" > > enable the RTC32K OSC only, if CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC is > enabled. Enable this in ti_am335x_common.h, so all boards in mainline > should work as before. > > Signed-off-by: Heiko Schocher <hs@denx.de> > Cc: Tom Rini <trini@ti.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131112/ab5c94b2/attachment.pgp> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable 2013-11-04 13:04 [U-Boot] [PATCH v3 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher 2013-11-04 13:04 ` [U-Boot] [PATCH v3 1/5] bootcount: store bootcount var in environment Heiko Schocher 2013-11-04 13:05 ` [U-Boot] [PATCH v3 2/5] arm, am33x: make RTC32K OSC enable configurable Heiko Schocher @ 2013-11-04 13:05 ` Heiko Schocher 2013-11-04 15:12 ` Lukasz Majewski 2013-11-04 13:05 ` [U-Boot] [PATCH v3 4/5] usb, g_dnl: make bcdDevice value configurable Heiko Schocher 2013-11-04 13:05 ` [U-Boot] [PATCH v3 5/5] arm, am335x: update for the siemens boards Heiko Schocher 4 siblings, 1 reply; 16+ messages in thread From: Heiko Schocher @ 2013-11-04 13:05 UTC (permalink / raw) To: u-boot add the possibility to set the iSerialNumber board specific. Default value for iSerialNumber is 0x0. This value can changed board specific through the new function g_dnl_set_serialnumber() which must be called from the board specific function g_dnl_bind_fixup(). Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Lukasz Majewski <l.majewski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> --- - changes for v3 rebase against current u-boot/master 509dca7a11aad394d781a9d31a7bfa6692562741 changes for v2: - as Lukasz Majewski suggested, remove CONFIG_G_DNL_SERIAL_STRING define --- drivers/usb/gadget/g_dnl.c | 20 ++++++++++++++++++++ include/g_dnl.h | 1 + 2 files changed, 21 insertions(+) diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 43f413a..8dc3d9f 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -33,6 +33,9 @@ #define STRING_PRODUCT 2 /* Index of String Descriptor describing this configuration */ #define STRING_USBDOWN 2 +/* Index of String serial */ +#define STRING_SERIAL 3 +#define MAX_STRING_SERIAL 32 /* Number of supported configurations */ #define CONFIGURATION_NUMBER 1 @@ -40,8 +43,16 @@ static const char shortname[] = "usb_dnl_"; static const char product[] = "USB download gadget"; +static char g_dnl_serial[MAX_STRING_SERIAL]; static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; +void g_dnl_set_serialnumber(char *s) +{ + memset(g_dnl_serial, 0, MAX_STRING_SERIAL); + if (strlen(s) < MAX_STRING_SERIAL) + strncpy(g_dnl_serial, s, strlen(s)); +} + static struct usb_device_descriptor device_desc = { .bLength = sizeof device_desc, .bDescriptorType = USB_DT_DEVICE, @@ -53,6 +64,7 @@ static struct usb_device_descriptor device_desc = { .idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM), .idProduct = __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM), .iProduct = STRING_PRODUCT, + .iSerialNumber = STRING_SERIAL, .bNumConfigurations = 1, }; @@ -63,6 +75,7 @@ static struct usb_device_descriptor device_desc = { static struct usb_string g_dnl_string_defs[] = { {.s = manufacturer}, {.s = product}, + {.s = g_dnl_serial}, { } /* end of list */ }; @@ -156,6 +169,13 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) g_dnl_string_defs[1].id = id; device_desc.iProduct = id; + id = usb_string_id(cdev); + if (id < 0) + return id; + + g_dnl_string_defs[2].id = id; + device_desc.iSerialNumber = id; + g_dnl_bind_fixup(&device_desc, cdev->driver->name); ret = g_dnl_config_register(cdev); if (ret) diff --git a/include/g_dnl.h b/include/g_dnl.h index de669fb..8f813c2 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -13,5 +13,6 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); +void g_dnl_set_serialnumber(char *); #endif /* __G_DOWNLOAD_H_ */ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable 2013-11-04 13:05 ` [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable Heiko Schocher @ 2013-11-04 15:12 ` Lukasz Majewski 2013-11-04 15:52 ` Heiko Schocher 2013-11-04 17:32 ` Marek Vasut 0 siblings, 2 replies; 16+ messages in thread From: Lukasz Majewski @ 2013-11-04 15:12 UTC (permalink / raw) To: u-boot Hi Heiko, > add the possibility to set the iSerialNumber board specific. > Default value for iSerialNumber is 0x0. This value can > changed board specific through the new function > g_dnl_set_serialnumber() which must be called from the > board specific function g_dnl_bind_fixup(). > Tested-by: Lukasz Majewski <l.majewski@samsung.com> Test HW: TRATS. I will apply it to u-boot-dfu. > Signed-off-by: Heiko Schocher <hs@denx.de> > Cc: Marek Vasut <marek.vasut@gmail.com> > Cc: Lukasz Majewski <l.majewski@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > > --- > - changes for v3 > rebase against current u-boot/master > 509dca7a11aad394d781a9d31a7bfa6692562741 > changes for v2: > - as Lukasz Majewski suggested, remove CONFIG_G_DNL_SERIAL_STRING > define > --- > drivers/usb/gadget/g_dnl.c | 20 ++++++++++++++++++++ > include/g_dnl.h | 1 + > 2 files changed, 21 insertions(+) > > diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c > index 43f413a..8dc3d9f 100644 > --- a/drivers/usb/gadget/g_dnl.c > +++ b/drivers/usb/gadget/g_dnl.c > @@ -33,6 +33,9 @@ > #define STRING_PRODUCT 2 > /* Index of String Descriptor describing this configuration */ > #define STRING_USBDOWN 2 > +/* Index of String serial */ > +#define STRING_SERIAL 3 > +#define MAX_STRING_SERIAL 32 > /* Number of supported configurations */ > #define CONFIGURATION_NUMBER 1 > > @@ -40,8 +43,16 @@ > > static const char shortname[] = "usb_dnl_"; > static const char product[] = "USB download gadget"; > +static char g_dnl_serial[MAX_STRING_SERIAL]; > static const char manufacturer[] = CONFIG_G_DNL_MANUFACTURER; > > +void g_dnl_set_serialnumber(char *s) > +{ > + memset(g_dnl_serial, 0, MAX_STRING_SERIAL); > + if (strlen(s) < MAX_STRING_SERIAL) > + strncpy(g_dnl_serial, s, strlen(s)); > +} > + > static struct usb_device_descriptor device_desc = { > .bLength = sizeof device_desc, > .bDescriptorType = USB_DT_DEVICE, > @@ -53,6 +64,7 @@ static struct usb_device_descriptor device_desc = { > .idVendor = __constant_cpu_to_le16(CONFIG_G_DNL_VENDOR_NUM), > .idProduct = > __constant_cpu_to_le16(CONFIG_G_DNL_PRODUCT_NUM), .iProduct = > STRING_PRODUCT, > + .iSerialNumber = STRING_SERIAL, > .bNumConfigurations = 1, > }; > > @@ -63,6 +75,7 @@ static struct usb_device_descriptor device_desc = { > static struct usb_string g_dnl_string_defs[] = { > {.s = manufacturer}, > {.s = product}, > + {.s = g_dnl_serial}, > { } /* end of list */ > }; > > @@ -156,6 +169,13 @@ static int g_dnl_bind(struct usb_composite_dev > *cdev) g_dnl_string_defs[1].id = id; > device_desc.iProduct = id; > > + id = usb_string_id(cdev); > + if (id < 0) > + return id; > + > + g_dnl_string_defs[2].id = id; > + device_desc.iSerialNumber = id; > + > g_dnl_bind_fixup(&device_desc, cdev->driver->name); > ret = g_dnl_config_register(cdev); > if (ret) > diff --git a/include/g_dnl.h b/include/g_dnl.h > index de669fb..8f813c2 100644 > --- a/include/g_dnl.h > +++ b/include/g_dnl.h > @@ -13,5 +13,6 @@ > int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); > int g_dnl_register(const char *s); > void g_dnl_unregister(void); > +void g_dnl_set_serialnumber(char *); > > #endif /* __G_DOWNLOAD_H_ */ -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable 2013-11-04 15:12 ` Lukasz Majewski @ 2013-11-04 15:52 ` Heiko Schocher 2013-11-04 17:32 ` Marek Vasut 1 sibling, 0 replies; 16+ messages in thread From: Heiko Schocher @ 2013-11-04 15:52 UTC (permalink / raw) To: u-boot Hello Lukasz, Am 04.11.2013 16:12, schrieb Lukasz Majewski: > Hi Heiko, > >> add the possibility to set the iSerialNumber board specific. >> Default value for iSerialNumber is 0x0. This value can >> changed board specific through the new function >> g_dnl_set_serialnumber() which must be called from the >> board specific function g_dnl_bind_fixup(). >> > > Tested-by: Lukasz Majewski<l.majewski@samsung.com> > > Test HW: TRATS. > > I will apply it to u-boot-dfu. Thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable 2013-11-04 15:12 ` Lukasz Majewski 2013-11-04 15:52 ` Heiko Schocher @ 2013-11-04 17:32 ` Marek Vasut 2013-11-05 7:24 ` Lukasz Majewski 1 sibling, 1 reply; 16+ messages in thread From: Marek Vasut @ 2013-11-04 17:32 UTC (permalink / raw) To: u-boot Dear Lukasz Majewski, > Hi Heiko, > > > add the possibility to set the iSerialNumber board specific. > > Default value for iSerialNumber is 0x0. This value can > > changed board specific through the new function > > g_dnl_set_serialnumber() which must be called from the > > board specific function g_dnl_bind_fixup(). > > Tested-by: Lukasz Majewski <l.majewski@samsung.com> > > Test HW: TRATS. > > I will apply it to u-boot-dfu. Is this u-boot-dfu a new thing ? Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable 2013-11-04 17:32 ` Marek Vasut @ 2013-11-05 7:24 ` Lukasz Majewski 2013-11-05 14:03 ` Marek Vasut 0 siblings, 1 reply; 16+ messages in thread From: Lukasz Majewski @ 2013-11-05 7:24 UTC (permalink / raw) To: u-boot Hi Marek, > Dear Lukasz Majewski, > > > Hi Heiko, > > > > > add the possibility to set the iSerialNumber board specific. > > > Default value for iSerialNumber is 0x0. This value can > > > changed board specific through the new function > > > g_dnl_set_serialnumber() which must be called from the > > > board specific function g_dnl_bind_fixup(). > > > > Tested-by: Lukasz Majewski <l.majewski@samsung.com> > > > > Test HW: TRATS. > > > > I will apply it to u-boot-dfu. > > Is this u-boot-dfu a new thing ? Yes. As we spoken at the mini summit. Marek, as a result you shall have less work :-) > > Best regards, > Marek Vasut -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable 2013-11-05 7:24 ` Lukasz Majewski @ 2013-11-05 14:03 ` Marek Vasut 2013-11-05 14:21 ` Lukasz Majewski 0 siblings, 1 reply; 16+ messages in thread From: Marek Vasut @ 2013-11-05 14:03 UTC (permalink / raw) To: u-boot Dear Lukasz Majewski, > Hi Marek, > > > Dear Lukasz Majewski, > > > > > Hi Heiko, > > > > > > > add the possibility to set the iSerialNumber board specific. > > > > Default value for iSerialNumber is 0x0. This value can > > > > changed board specific through the new function > > > > g_dnl_set_serialnumber() which must be called from the > > > > board specific function g_dnl_bind_fixup(). > > > > > > Tested-by: Lukasz Majewski <l.majewski@samsung.com> > > > > > > Test HW: TRATS. > > > > > > I will apply it to u-boot-dfu. > > > > Is this u-boot-dfu a new thing ? > > Yes. As we spoken at the mini summit. > > Marek, as a result you shall have less work :-) Cool, are you sending this directly to Tom or am I getting pullRQ from you ? Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable 2013-11-05 14:03 ` Marek Vasut @ 2013-11-05 14:21 ` Lukasz Majewski 0 siblings, 0 replies; 16+ messages in thread From: Lukasz Majewski @ 2013-11-05 14:21 UTC (permalink / raw) To: u-boot Hi Marek, > Dear Lukasz Majewski, > > > Hi Marek, > > > > > Dear Lukasz Majewski, > > > > > > > Hi Heiko, > > > > > > > > > add the possibility to set the iSerialNumber board specific. > > > > > Default value for iSerialNumber is 0x0. This value can > > > > > changed board specific through the new function > > > > > g_dnl_set_serialnumber() which must be called from the > > > > > board specific function g_dnl_bind_fixup(). > > > > > > > > Tested-by: Lukasz Majewski <l.majewski@samsung.com> > > > > > > > > Test HW: TRATS. > > > > > > > > I will apply it to u-boot-dfu. > > > > > > Is this u-boot-dfu a new thing ? > > > > Yes. As we spoken at the mini summit. > > > > Marek, as a result you shall have less work :-) > > Cool, are you sending this directly to Tom or am I getting pullRQ > from you ? I guess, that it is up to You and Tom. > > Best regards, > Marek Vasut -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 4/5] usb, g_dnl: make bcdDevice value configurable 2013-11-04 13:04 [U-Boot] [PATCH v3 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher ` (2 preceding siblings ...) 2013-11-04 13:05 ` [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable Heiko Schocher @ 2013-11-04 13:05 ` Heiko Schocher 2013-11-12 15:03 ` [U-Boot] [U-Boot, v3, " Tom Rini 2013-11-04 13:05 ` [U-Boot] [PATCH v3 5/5] arm, am335x: update for the siemens boards Heiko Schocher 4 siblings, 1 reply; 16+ messages in thread From: Heiko Schocher @ 2013-11-04 13:05 UTC (permalink / raw) To: u-boot add the possibility to set the bcdDevice number board specific. Therefore the weak function g_dnl_get_board_bcd_device_number() is introduced. Used on the siemens boards. Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Lukasz Majewski <l.majewski@samsung.com> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> --- - changes for v3 rebase against current u-boot/master 509dca7a11aad394d781a9d31a7bfa6692562741 - changes for v2: add Acked-by from Lukasz Majewski --- drivers/usb/gadget/g_dnl.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 8dc3d9f..dd95afe 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -147,6 +147,23 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) return 0; } +__weak int g_dnl_get_board_bcd_device_number(int gcnum) +{ + return gcnum; +} + +static int g_dnl_get_bcd_device_number(struct usb_composite_dev *cdev) +{ + struct usb_gadget *gadget = cdev->gadget; + int gcnum; + + gcnum = usb_gadget_controller_number(gadget); + if (gcnum > 0) + gcnum += 0x200; + + return g_dnl_get_board_bcd_device_number(gcnum); +} + static int g_dnl_bind(struct usb_composite_dev *cdev) { struct usb_gadget *gadget = cdev->gadget; @@ -181,11 +198,9 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) if (ret) goto error; - gcnum = usb_gadget_controller_number(gadget); - - debug("gcnum: %d\n", gcnum); + gcnum = g_dnl_get_bcd_device_number(cdev); if (gcnum >= 0) - device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum); + device_desc.bcdDevice = cpu_to_le16(gcnum); else { debug("%s: controller '%s' not recognized\n", shortname, gadget->name); -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 4/5] usb, g_dnl: make bcdDevice value configurable 2013-11-04 13:05 ` [U-Boot] [PATCH v3 4/5] usb, g_dnl: make bcdDevice value configurable Heiko Schocher @ 2013-11-12 15:03 ` Tom Rini 0 siblings, 0 replies; 16+ messages in thread From: Tom Rini @ 2013-11-12 15:03 UTC (permalink / raw) To: u-boot On Mon, Nov 04, 2013 at 02:05:02PM +0100, Heiko Schocher wrote: > add the possibility to set the bcdDevice number board specific. > Therefore the weak function g_dnl_get_board_bcd_device_number() > is introduced. Used on the siemens boards. > > Signed-off-by: Heiko Schocher <hs@denx.de> > Acked-by: Lukasz Majewski <l.majewski@samsung.com> > Cc: Marek Vasut <marek.vasut@gmail.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131112/2849f40c/attachment.pgp> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [U-Boot] [PATCH v3 5/5] arm, am335x: update for the siemens boards 2013-11-04 13:04 [U-Boot] [PATCH v3 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher ` (3 preceding siblings ...) 2013-11-04 13:05 ` [U-Boot] [PATCH v3 4/5] usb, g_dnl: make bcdDevice value configurable Heiko Schocher @ 2013-11-04 13:05 ` Heiko Schocher 2013-11-12 15:04 ` [U-Boot] [U-Boot, v3, " Tom Rini 4 siblings, 1 reply; 16+ messages in thread From: Heiko Schocher @ 2013-11-04 13:05 UTC (permalink / raw) To: u-boot From: Samuel Egli <samuel.egli@siemens.com> - dxr2: define unused pins as input - do not enable RTC32K OSC on dxr2 board - update default environment - add splashpos=m,m to default environment, so splash screen is always centered. - adapt environment for bootcount feature - add altbootcmd to default environment - rut: SPL add early reset pulse for eth-phy, maXTouch and display - rut: display timing aenderungen - siemens boards: adapt for background color = white - add boutcount feature for the siemens boards store the bootcount in the environment, as we have no softreset save registers on this hardware. Use therefore the CONFIG_BOOTCOUNT_ENV bootcount driver. - change spi mode from 3 to 0 for the lcd init - add gpio pin for lcd reset with state 0 and add mdelay - siemens boards: use own USB id's - add dfu serial and device number for siemens boards Add for the siemens boards the possibility to define in dfu mode, the iSerialNumber and the bcdDevice fields in the USB Device descriptor. - fix upgrade mechanism based on bootcount Correct location of saveenv and remove not active variable. Add CONFIG_BOOT_RETRY_TIME and CONFIG_RESET_TO_RETRY to reboot board in case of empty kernel partition. Without these defines an empty kernel partition leads to an abort of boot process and one remains in u-boot prompt. - general cleanup of dxr2, pxm2 and rut boards all: * Remove net boot from bootcmd Ping can cause a crash on boards without ethernet phy. net_nfs command is used only for development * Add reset at the end of bootcmd In order to have an immediate reset of the boot when bootcmd fails, add reset at the end of bootcmd. rut: * add nand_img_size dxr2: * update nand_img_size * ddr3 timings updated with iocontrol property that can be modified via eeprom. New default parameters from software leveling with draco ES2. Signed-off-by: Samuel Egli <samuel.egli@siemens.com> Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Roger Meier <r.meier@siemens.com> Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Matthias Michel <matthias.michel@siemens.com> Cc: Tom Rini <trini@ti.com> --- - changes for v3 rebase against current u-boot/master 509dca7a11aad394d781a9d31a7bfa6692562741 changes for v2: - remove CONFIG_G_DNL_SERIAL_STRING --- board/siemens/common/factoryset.c | 24 ++++- board/siemens/common/factoryset.h | 2 + board/siemens/dxr2/board.c | 11 +-- board/siemens/dxr2/board.h | 9 +- board/siemens/dxr2/mux.c | 158 +++++++++++++++++++++++++++++++++ board/siemens/pxm2/board.c | 3 +- board/siemens/rut/board.c | 51 +++++++++-- include/configs/dxr2.h | 13 ++- include/configs/pxm2.h | 7 +- include/configs/rut.h | 10 ++- include/configs/siemens-am33x-common.h | 69 ++++++++++---- 11 files changed, 305 insertions(+), 52 deletions(-) diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c index fbe7997..266dbbb 100644 --- a/board/siemens/common/factoryset.c +++ b/board/siemens/common/factoryset.c @@ -15,7 +15,8 @@ #include <asm/arch/sys_proto.h> #include <asm/unaligned.h> #include <net.h> -#include <usbdescriptors.h> +#include <errno.h> +#include <g_dnl.h> #include "factoryset.h" #define EEPR_PG_SZ 0x80 @@ -224,8 +225,20 @@ int factoryset_read_eeprom(int i2c_addr) MAX_STRING_LENGTH)) { debug("display name: %s\n", factory_dat.disp_name); } - #endif + if (0 <= get_factory_record_val(cp, size, (uchar *)"DEV", + (uchar *)"num", factory_dat.serial, + MAX_STRING_LENGTH)) { + debug("serial number: %s\n", factory_dat.serial); + } + if (0 <= get_factory_record_val(cp, size, (uchar *)"DEV", + (uchar *)"ver", buf, + MAX_STRING_LENGTH)) { + factory_dat.version = simple_strtoul((char *)buf, + NULL, 16); + debug("version number: %d\n", factory_dat.version); + } + return 0; err: @@ -279,6 +292,13 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { put_unaligned(factory_dat.usb_vendor_id, &dev->idVendor); put_unaligned(factory_dat.usb_product_id, &dev->idProduct); + g_dnl_set_serialnumber((char *)factory_dat.serial); + return 0; } + +int g_dnl_get_board_bcd_device_number(int gcnum) +{ + return factory_dat.version; +} #endif /* defined(CONFIG_SPL_BUILD) */ diff --git a/board/siemens/common/factoryset.h b/board/siemens/common/factoryset.h index 445f384..4d6de10 100644 --- a/board/siemens/common/factoryset.h +++ b/board/siemens/common/factoryset.h @@ -18,6 +18,8 @@ struct factorysetcontainer { #if defined(CONFIG_VIDEO) unsigned char disp_name[MAX_STRING_LENGTH]; #endif + unsigned char serial[MAX_STRING_LENGTH]; + int version; }; int factoryset_read_eeprom(int i2c_addr); diff --git a/board/siemens/dxr2/board.c b/board/siemens/dxr2/board.c index af9d84f..1773ab7 100644 --- a/board/siemens/dxr2/board.c +++ b/board/siemens/dxr2/board.c @@ -38,11 +38,11 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_SPL_BUILD static struct dxr2_baseboard_id __attribute__((section(".data"))) settings; - +/* @303MHz-i0 */ const struct ddr3_data ddr3_default = { - 0x33524444, 0x56312e33, 0x0100, 0x0001, 0x003A, 0x008A, 0x010B, - 0x00C4, 0x0888A39B, 0x26247FDA, 0x501F821F, 0x0006, 0x61C04AB2, - 0x00000618, + 0x33524444, 0x56312e34, 0x0080, 0x0000, 0x0038, 0x003E, 0x00A4, + 0x0075, 0x0888A39B, 0x26247FDA, 0x501F821F, 0x00100206, 0x61A44A32, + 0x00000618, 0x0000014A, }; static void set_default_ddr3_timings(void) @@ -73,6 +73,7 @@ static void print_ddr3_timings(void) PRINTARGS(sdram_config); PRINTARGS(ref_ctrl); + PRINTARGS(ioctr_val); } static void print_chip_data(void) @@ -168,7 +169,7 @@ struct cmd_control dxr2_ddr3_cmd_ctrl_data = { dxr2_ddr3_cmd_ctrl_data.cmd2csratio = settings.ddr3.ddr3_sratio; dxr2_ddr3_cmd_ctrl_data.cmd2iclkout = settings.ddr3.iclkout; - config_ddr(DDR_PLL_FREQ, DXR2_IOCTRL_VAL, &dxr2_ddr3_data, + config_ddr(DDR_PLL_FREQ, settings.ddr3.ioctr_val, &dxr2_ddr3_data, &dxr2_ddr3_cmd_ctrl_data, &dxr2_ddr3_emif_reg_data, 0); } diff --git a/board/siemens/dxr2/board.h b/board/siemens/dxr2/board.h index 2be78fb..abf5432 100644 --- a/board/siemens/dxr2/board.h +++ b/board/siemens/dxr2/board.h @@ -22,11 +22,11 @@ #define MAGIC_CHIP 0x50494843 /* Automatic generated definition */ -/* Wed, 19 Jun 2013 10:57:48 +0200 */ -/* From file: draco/ddr3-data-micron.txt */ +/* Wed, 18 Sep 2013 18:58:27 +0200 */ +/* From file: draco/ddr3-data-micron-v2.txt */ struct ddr3_data { unsigned int magic; /* 0x33524444 */ - unsigned int version; /* 0x56312e33 */ + unsigned int version; /* 0x56312e34 */ unsigned short int ddr3_sratio; /* 0x0100 */ unsigned short int iclkout; /* 0x0001 */ unsigned short int dt0rdsratio0; /* 0x003A */ @@ -36,9 +36,10 @@ struct ddr3_data { unsigned int sdram_tim1; /* 0x0888A39B */ unsigned int sdram_tim2; /* 0x26247FDA */ unsigned int sdram_tim3; /* 0x501F821F */ - unsigned short int emif_ddr_phy_ctlr_1; /* 0x0006 */ + unsigned int emif_ddr_phy_ctlr_1; /* 0x00100206 */ unsigned int sdram_config; /* 0x61C04AB2 */ unsigned int ref_ctrl; /* 0x00000618 */ + unsigned int ioctr_val; /* 0x0000018B */ }; struct chip_data { diff --git a/board/siemens/dxr2/mux.c b/board/siemens/dxr2/mux.c index bc80b79..5c22999 100644 --- a/board/siemens/dxr2/mux.c +++ b/board/siemens/dxr2/mux.c @@ -63,6 +63,164 @@ static struct module_pin_mux gpios_pin_mux[] = { {OFFSET(gpmc_ad11), (MODE(7) | PULLUDEN | RXACTIVE)}, {OFFSET(gpmc_csn3), MODE(7) }, /* LED0 GPIO2_0 */ {OFFSET(emu0), MODE(7)}, /* LED1 GPIO3_7 */ + /* Triacs in HW Rev 2 */ + {OFFSET(uart1_ctsn), MODE(7) | PULLUDDIS | RXACTIVE}, /* Y5 GPIO0_12*/ + {OFFSET(mmc0_dat1), MODE(7) | PULLUDDIS | RXACTIVE}, /* Y3 GPIO2_28*/ + {OFFSET(mmc0_dat2), MODE(7) | PULLUDDIS | RXACTIVE}, /* Y7 GPIO2_27*/ + /* Triacs initial HW Rev */ + {OFFSET(gpmc_csn1), MODE(7) | RXACTIVE | PULLUDDIS}, /* 1_30 Y0 */ + {OFFSET(gpmc_be1n), MODE(7) | RXACTIVE | PULLUDDIS}, /* 1_28 Y1 */ + {OFFSET(gpmc_csn2), MODE(7) | RXACTIVE | PULLUDDIS}, /* 1_31 Y2 */ + {OFFSET(lcd_data15), MODE(7) | RXACTIVE | PULLUDDIS}, /* 0_11 Y3 */ + {OFFSET(lcd_data14), MODE(7) | RXACTIVE | PULLUDDIS}, /* 0_10 Y4 */ + {OFFSET(gpmc_clk), MODE(7) | RXACTIVE | PULLUDDIS}, /* 2_1 Y5 */ + {OFFSET(emu1), MODE(7) | RXACTIVE | PULLUDDIS}, /* 3_8 Y6 */ + {OFFSET(gpmc_ad15), MODE(7) | RXACTIVE | PULLUDDIS}, /* 1_15 Y7 */ + /* Remaining pins that were not used in this file */ + {OFFSET(gpmc_ad8), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_ad9), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a2), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a3), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a4), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a5), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a6), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a7), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a8), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a9), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a10), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(gpmc_a11), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data2), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data3), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data4), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data5), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data6), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data7), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data8), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_data9), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_vsync), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_hsync), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_pclk), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(lcd_ac_bias_en), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mmc0_dat3), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mmc0_dat0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mmc0_clk), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mmc0_cmd), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(spi0_sclk), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(spi0_d0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(spi0_d1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(spi0_cs0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(uart0_ctsn), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(uart0_rtsn), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(uart1_rtsn), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(uart1_rxd), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(uart1_txd), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_aclkx), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_fsx), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_axr0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_ahclkr), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_aclkr), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_fsr), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_axr1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(mcasp0_ahclkx), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(xdma_event_intr0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(xdma_event_intr1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(nresetin_out), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(porz), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(nnmi), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(osc0_in), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(osc0_out), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(rsvd1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(tms), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(tdi), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(tdo), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(tck), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ntrst), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(osc1_in), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(osc1_out), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(pmic_power_en), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(rtc_porz), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(rsvd2), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ext_wakeup), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(enz_kaldo_1p8v), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb0_dm), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb0_dp), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb0_ce), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb0_id), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb0_vbus), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb0_drvvbus), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb1_dm), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb1_dp), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb1_ce), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb1_id), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb1_vbus), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(usb1_drvvbus), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_resetn), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_csn0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_cke), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_ck), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_nck), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_casn), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_rasn), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_wen), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_ba0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_ba1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_ba2), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a2), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a3), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a4), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a5), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a6), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a7), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a8), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a9), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a10), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a11), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a12), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a13), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a14), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_a15), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_odt), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d2), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d3), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d4), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d5), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d6), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d7), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d8), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d9), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d10), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d11), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d12), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d13), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d14), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_d15), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_dqm0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_dqm1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_dqs0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_dqsn0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_dqs1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_dqsn1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_vref), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_vtp), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_strben0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ddr_strben1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain7), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain6), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain5), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain4), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain3), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain2), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain1), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(ain0), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(vrefp), MODE(7) | RXACTIVE | PULLUDDIS}, + {OFFSET(vrefn), MODE(7) | RXACTIVE | PULLUDDIS}, {-1}, }; diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c index 2c1841f..094b4d6 100644 --- a/board/siemens/pxm2/board.c +++ b/board/siemens/pxm2/board.c @@ -413,8 +413,7 @@ static int conf_disp_pll(int m, int n) static int board_video_init(void) { - /* set 300 MHz */ - conf_disp_pll(25, 2); + conf_disp_pll(24, 1); if (factory_dat.pxm50) da8xx_video_init(&lcd_panels[0], &lcd_cfg, lcd_cfg.bpp); else diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index 5de8fc6..0cf17ef 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -83,9 +83,48 @@ struct cmd_control rut_ddr3_cmd_ctrl_data = { &rut_ddr3_cmd_ctrl_data, &rut_ddr3_emif_reg_data, 0); } +static int request_and_pulse_reset(int gpio, const char *name) +{ + int ret; + const int delay_us = 2000; /* 2ms */ + + ret = gpio_request(gpio, name); + if (ret < 0) { + printf("%s: Unable to request %s\n", __func__, name); + goto err; + } + + ret = gpio_direction_output(gpio, 0); + if (ret < 0) { + printf("%s: Unable to set %s as output\n", __func__, name); + goto err_free_gpio; + } + + udelay(delay_us); + + gpio_set_value(gpio, 1); + + return 0; + +err_free_gpio: + gpio_free(gpio); +err: + return ret; +} + +#define GPIO_TO_PIN(bank, gpio) (32 * (bank) + (gpio)) +#define ETH_PHY_RESET_GPIO GPIO_TO_PIN(2, 18) +#define MAXTOUCH_RESET_GPIO GPIO_TO_PIN(3, 18) +#define DISPLAY_RESET_GPIO GPIO_TO_PIN(3, 19) + +#define REQUEST_AND_PULSE_RESET(N) \ + request_and_pulse_reset(N, #N); + static void spl_siemens_board_init(void) { - return; + REQUEST_AND_PULSE_RESET(ETH_PHY_RESET_GPIO); + REQUEST_AND_PULSE_RESET(MAXTOUCH_RESET_GPIO); + REQUEST_AND_PULSE_RESET(DISPLAY_RESET_GPIO); } #endif /* if def CONFIG_SPL_BUILD */ @@ -336,7 +375,6 @@ int clk_get(int clk) static int conf_disp_pll(int m, int n) { struct cm_perpll *cmper = (struct cm_perpll *)CM_PER; - struct cm_dpll *cmdpll = (struct cm_dpll *)CM_DPLL; struct dpll_params dpll_lcd = {m, n, -1, -1, -1, -1, -1}; #if defined(DISPL_PLL_SPREAD_SPECTRUM) struct cm_wkuppll *cmwkup = (struct cm_wkuppll *)CM_WKUP; @@ -353,8 +391,6 @@ static int conf_disp_pll(int m, int n) 0 }; do_enable_clocks(clk_domains, clk_modules_explicit_en, 1); - /* 0x44e0_0500 write lcdc pixel clock mux Linux hat hier 0 */ - writel(0x0, &cmdpll->clklcdcpixelclk); do_setup_dpll(&dpll_lcd_regs, &dpll_lcd); @@ -380,10 +416,13 @@ static int enable_lcd(void) { unsigned char buf[1]; + set_gpio(BOARD_LCD_RESET, 0); + mdelay(1); set_gpio(BOARD_LCD_RESET, 1); + mdelay(1); /* spi lcd init */ - kwh043st20_f01_spi_startup(1, 0, 5000000, SPI_MODE_3); + kwh043st20_f01_spi_startup(1, 0, 5000000, SPI_MODE_0); /* backlight on */ buf[0] = 0xf; @@ -418,7 +457,7 @@ static int board_video_init(void) printf("%s: %s not found, using default %s\n", __func__, factory_dat.disp_name, lcd_panels[i].name); } - conf_disp_pll(25, 2); + conf_disp_pll(24, 1); da8xx_video_init(&lcd_panels[display], &lcd_cfgs[display], lcd_cfgs[display].bpp); diff --git a/include/configs/dxr2.h b/include/configs/dxr2.h index cd553ec..1e42f5c 100644 --- a/include/configs/dxr2.h +++ b/include/configs/dxr2.h @@ -21,8 +21,8 @@ #define CONFIG_SYS_MPUCLK 275 #define DXR2_IOCTRL_VAL 0x18b -#define DDR_PLL_FREQ 266 -#define CONFIG_SPL_AM33XX_DO_NOT_ENABLE_RTC32K +#define DDR_PLL_FREQ 303 +#undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC #define BOARD_DFU_BUTTON_GPIO 27 #define BOARD_DFU_BUTTON_LED 64 @@ -62,7 +62,7 @@ /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=dxr2\0" \ - "nand_img_size=0x300000\0" \ + "nand_img_size=0x400000\0" \ "optargs=\0" \ CONFIG_COMMON_ENV_SETTINGS @@ -75,10 +75,9 @@ "run dfu_start; " \ "reset; " \ "fi;" \ -"if ping ${serverip}; then " \ - "run net_nfs; " \ -"fi;" \ -"run nand_boot;" +"run nand_boot;" \ +"reset;" + #else #define CONFIG_BOOTDELAY 0 diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 20b0f9a..7722f7b 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -70,6 +70,7 @@ "hostname=pxm2\0" \ "nand_img_size=0x500000\0" \ "optargs=\0" \ + "splashpos=m,m\0" \ CONFIG_COMMON_ENV_SETTINGS \ "mmc_dev=0\0" \ "mmc_root=/dev/mmcblk0p2 rw\0" \ @@ -118,9 +119,7 @@ "fi;" \ "fi;" \ "run nand_boot;" \ - "if ping ${serverip}; then " \ - "run net_nfs; " \ - "fi; " + "reset;" #else #define CONFIG_BOOTDELAY 0 @@ -148,6 +147,8 @@ #define DA8XX_LCD_CNTL_BASE LCD_CNTL_BASE #define PWM_TICKS 0x1388 #define PWM_DUTY 0x200 +#define CONFIG_SYS_CONSOLE_BG_COL 0xff +#define CONFIG_SYS_CONSOLE_FG_COL 0x00 #endif #endif /* ! __CONFIG_PXM2_H */ diff --git a/include/configs/rut.h b/include/configs/rut.h index 7c94644..d4519f9 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -65,7 +65,8 @@ /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ "hostname=rut\0" \ - "splashpos=488,352\0" \ + "nand_img_size=0x500000\0" \ + "splashpos=m,m\0" \ "optargs=fixrtc --no-log consoleblank=0 \0" \ CONFIG_COMMON_ENV_SETTINGS \ "mmc_dev=0\0" \ @@ -111,9 +112,7 @@ "fi;" \ "fi;" \ "run nand_boot;" \ - "if ping ${serverip}; then " \ - "run net_nfs; " \ - "fi; " + "reset;" #else #define CONFIG_BOOTDELAY 0 @@ -151,6 +150,9 @@ #define BOARD_LCD_RESET 115 /* Bank 3 pin 19 */ #define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_FORMIKE +#define DISPL_PLL_SPREAD_SPECTRUM +#define CONFIG_SYS_CONSOLE_BG_COL 0xff +#define CONFIG_SYS_CONSOLE_FG_COL 0x00 #endif #endif /* ! __CONFIG_RUT_H */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 03c143d..832dc34 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -255,11 +255,11 @@ #define CONFIG_USB_GADGET #define CONFIG_USBDOWNLOAD_GADGET -/* USB TI's IDs */ +/* USB DRACO ID as default */ #define CONFIG_USBD_HS -#define CONFIG_G_DNL_VENDOR_NUM 0x0525 -#define CONFIG_G_DNL_PRODUCT_NUM 0x4a47 -#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" +#define CONFIG_G_DNL_VENDOR_NUM 0x0908 +#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2 +#define CONFIG_G_DNL_MANUFACTURER "Siemens AG" /* USB Device Firmware Update support */ #define CONFIG_DFU_FUNCTION @@ -359,31 +359,38 @@ #define CONFIG_COMMON_ENV_SETTINGS \ "verify=no \0" \ "project_dir=systemone\0" \ + "upgrade_available=0\0" \ + "altbootcmd=run bootcmd\0" \ + "bootlimit=3\0" \ + "partitionset_active=A\0" \ "loadaddr=0x82000000\0" \ "kloadaddr=0x81000000\0" \ "script_addr=0x81900000\0" \ - "console=console=ttyMTD,mtdoops console=ttyO0,115200n8\0" \ - "active_set=a\0" \ + "console=console=ttyMTD,mtdoops console=ttyO0,115200n8 panic=5\0" \ "nand_active_ubi_vol=rootfs_a\0" \ + "nand_active_ubi_vol_A=rootfs_a\0" \ + "nand_active_ubi_vol_B=rootfs_b\0" \ "nand_root_fs_type=ubifs rootwait=1\0" \ "nand_src_addr=0x280000\0" \ - "nand_src_addr_a=0x280000\0" \ - "nand_src_addr_b=0x780000\0" \ + "nand_src_addr_A=0x280000\0" \ + "nand_src_addr_B=0x780000\0" \ "nfsopts=nolock rw mem=128M\0" \ "ip_method=none\0" \ "bootenv=uEnv.txt\0" \ "bootargs_defaults=setenv bootargs " \ "console=${console} " \ + "${testargs} " \ "${optargs}\0" \ "nand_args=run bootargs_defaults;" \ "mtdparts default;" \ - "setenv nand_active_ubi_vol rootfs_${active_set};" \ - "setenv ${active_set} true;" \ - "if test -n ${a}; then " \ - "setenv nand_src_addr ${nand_src_addr_a};" \ + "setenv ${partitionset_active} true;" \ + "if test -n ${A}; then " \ + "setenv nand_active_ubi_vol ${nand_active_ubi_vol_A};" \ + "setenv nand_src_addr ${nand_src_addr_A};" \ "fi;" \ - "if test -n ${b}; then " \ - "setenv nand_src_addr ${nand_src_addr_b};" \ + "if test -n ${B}; then " \ + "setenv nand_active_ubi_vol ${nand_active_ubi_vol_B};" \ + "setenv nand_src_addr ${nand_src_addr_B};" \ "fi;" \ "setenv nand_root ubi0:${nand_active_ubi_vol} rw " \ "ubi.mtd=9,2048;" \ @@ -404,9 +411,26 @@ "setenv bootargs ${bootargs} " \ "root=/dev/nfs ${mtdparts} " \ "nfsroot=${serverip}:${rootpath},${nfsopts} " \ - "addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \ + "ip=${ipaddr}:${serverip}:" \ "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \ - "nand_boot=echo Booting from nand, active set ${active_set} ...; " \ + "nand_boot=echo Booting from nand; " \ + "if test ${upgrade_available} -eq 1; then " \ + "if test ${bootcount} -gt ${bootlimit}; " \ + "then " \ + "setenv upgrade_available 0;" \ + "setenv ${partitionset_active} true;" \ + "if test -n ${A}; then " \ + "setenv partitionset_active B; " \ + "env delete A; " \ + "fi;" \ + "if test -n ${B}; then " \ + "setenv partitionset_active A; " \ + "env delete B; " \ + "fi;" \ + "saveenv; " \ + "fi;" \ + "fi;" \ + "echo set ${partitionset_active}...;" \ "run nand_args; " \ "nand read.i ${kloadaddr} ${nand_src_addr} " \ "${nand_img_size}; bootm ${kloadaddr}\0" \ @@ -415,7 +439,7 @@ "tftpboot ${kloadaddr} ${serverip}:${bootfile}; " \ "bootm ${kloadaddr}\0" \ "flash_self=run nand_boot\0" \ - "flash_self_test=setenv bootargs_defaults ${bootargs_defaults} test; " \ + "flash_self_test=setenv testargs test; " \ "run nand_boot\0" \ "dfu_start=echo Preparing for dfu mode ...; " \ "run dfu_args; \0" \ @@ -426,8 +450,9 @@ "mode; echo Not ready yet: 'run flash_nfs' to use kernel " \ "from memory and root filesystem over NFS; echo Type " \ "'run net_nfs' to get Kernel over TFTP and mount root " \ - "filesystem over NFS; echo Set active_set variable to 'a' " \ - "or 'b' to select kernel and rootfs partition; " \ + "filesystem over NFS; " \ + "echo Set partitionset_active variable to 'A' " \ + "or 'B' to select kernel and rootfs partition; " \ "echo" \ "\0" @@ -457,4 +482,10 @@ #define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds, " \ "press \"<Esc><Esc>\" to stop\n", bootdelay +/* Reboot after 60 sec if bootcmd fails */ +#define CONFIG_RESET_TO_RETRY +#define CONFIG_BOOT_RETRY_TIME 60 + +#define CONFIG_BOOTCOUNT_LIMIT +#define CONFIG_BOOTCOUNT_ENV #endif /* ! __CONFIG_SIEMENS_AM33X_COMMON_H */ -- 1.8.3.1 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [U-Boot] [U-Boot, v3, 5/5] arm, am335x: update for the siemens boards 2013-11-04 13:05 ` [U-Boot] [PATCH v3 5/5] arm, am335x: update for the siemens boards Heiko Schocher @ 2013-11-12 15:04 ` Tom Rini 0 siblings, 0 replies; 16+ messages in thread From: Tom Rini @ 2013-11-12 15:04 UTC (permalink / raw) To: u-boot On Mon, Nov 04, 2013 at 02:05:03PM +0100, Heiko Schocher wrote: > From: Samuel Egli <samuel.egli@siemens.com> > > - dxr2: define unused pins as input > - do not enable RTC32K OSC on dxr2 board > - update default environment > - add splashpos=m,m to default environment, so splash screen is always > centered. > - adapt environment for bootcount feature > - add altbootcmd to default environment > - rut: SPL add early reset pulse for eth-phy, maXTouch and display > - rut: display timing aenderungen > - siemens boards: adapt for background color = white > - add boutcount feature for the siemens boards > store the bootcount in the environment, as we have no softreset > save registers on this hardware. Use therefore the CONFIG_BOOTCOUNT_ENV > bootcount driver. > - change spi mode from 3 to 0 for the lcd init > - add gpio pin for lcd reset with state 0 and add mdelay > - siemens boards: use own USB id's > - add dfu serial and device number for siemens boards > Add for the siemens boards the possibility to define in dfu mode, > the iSerialNumber and the bcdDevice fields in the USB Device > descriptor. > - fix upgrade mechanism based on bootcount > Correct location of saveenv and remove not active variable. > > Add CONFIG_BOOT_RETRY_TIME and CONFIG_RESET_TO_RETRY to > reboot board in case of empty kernel partition. Without > these defines an empty kernel partition leads to an > abort of boot process and one remains in u-boot prompt. > > - general cleanup of dxr2, pxm2 and rut boards > all: > * Remove net boot from bootcmd > Ping can cause a crash on boards without ethernet phy. > net_nfs command is used only for development > > * Add reset at the end of bootcmd > In order to have an immediate reset of the boot when bootcmd > fails, add reset at the end of bootcmd. > > rut: > * add nand_img_size > > dxr2: > * update nand_img_size > > * ddr3 timings updated with iocontrol property that can be > modified via eeprom. New default parameters from software > leveling with draco ES2. > > Signed-off-by: Samuel Egli <samuel.egli@siemens.com> > Signed-off-by: Pascal Bach <pascal.bach@siemens.com> > Signed-off-by: Roger Meier <r.meier@siemens.com> > Signed-off-by: Heiko Schocher <hs@denx.de> > Cc: Matthias Michel <matthias.michel@siemens.com> > Cc: Tom Rini <trini@ti.com> Applied to u-boot/master, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131112/49d122bd/attachment.pgp> ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2013-11-12 15:04 UTC | newest] Thread overview: 16+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-11-04 13:04 [U-Boot] [PATCH v3 0/5] arm, am33xx: update for the am33xx based siemens boards Heiko Schocher 2013-11-04 13:04 ` [U-Boot] [PATCH v3 1/5] bootcount: store bootcount var in environment Heiko Schocher 2013-11-12 14:52 ` [U-Boot] [U-Boot, v3, " Tom Rini 2013-11-04 13:05 ` [U-Boot] [PATCH v3 2/5] arm, am33x: make RTC32K OSC enable configurable Heiko Schocher 2013-11-12 14:52 ` [U-Boot] [U-Boot, v3, " Tom Rini 2013-11-04 13:05 ` [U-Boot] [PATCH v3 3/5] usb, g_dnl: make iSerialNumber board configurable Heiko Schocher 2013-11-04 15:12 ` Lukasz Majewski 2013-11-04 15:52 ` Heiko Schocher 2013-11-04 17:32 ` Marek Vasut 2013-11-05 7:24 ` Lukasz Majewski 2013-11-05 14:03 ` Marek Vasut 2013-11-05 14:21 ` Lukasz Majewski 2013-11-04 13:05 ` [U-Boot] [PATCH v3 4/5] usb, g_dnl: make bcdDevice value configurable Heiko Schocher 2013-11-12 15:03 ` [U-Boot] [U-Boot, v3, " Tom Rini 2013-11-04 13:05 ` [U-Boot] [PATCH v3 5/5] arm, am335x: update for the siemens boards Heiko Schocher 2013-11-12 15:04 ` [U-Boot] [U-Boot, v3, " Tom Rini
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox