ArchosG9: add keyboard input and new reset menu entries (v4)
Subsystems (2)
PATCH 1/1 ArchosG9: add keyboard input and new reset menu entries (v4)
Same as v3, but_boot order command is now wholly contained in arch/arm/mach-omap
Vicente Bergas (1):
OMAP4: add command to select next boot device priority
arch/arm/mach-omap/Kconfig | 7 +++ arch/arm/mach-omap/Makefile | 1 + arch/arm/mach-omap/boot_order.c | 83 +++++++++++++++++++++++++ arch/arm/mach-omap/include/mach/omap4-silicon.h | 20 ++++++ arch/arm/mach-omap/omap4_generic.c | 20 ++++++ 5 files changed, 131 insertions(+) create mode 100644 arch/arm/mach-omap/boot_order.c
Signature · 7 lines
1.8.2.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/1 OMAP4: add command to select next boot device priority
On OMAP4 SoC there is a SAR memory region (Save & Rescue) where the ROM code reads the device to boot from. This patch adds a way to set this.
Signed-off-by Vicente Bergas <[email protected]>
--- arch/arm/mach-omap/Kconfig | 7 +++ arch/arm/mach-omap/Makefile | 1 + arch/arm/mach-omap/boot_order.c | 83 +++++++++++++++++++++++++ arch/arm/mach-omap/include/mach/omap4-silicon.h | 20 ++++++ arch/arm/mach-omap/omap4_generic.c | 20 ++++++ 5 files changed, 131 insertions(+) create mode 100644 arch/arm/mach-omap/boot_order.c
arch/arm/mach-omap/Kconfig +7 -0
@@ -104,6 +104,13 @@ config OMAP4_USBBOOT You need the utility program omap4_usbboot to boot from USB. Please read omap4_usb_booting.txt for more information. +config CMD_BOOT_ORDER + tristate + depends on ARCH_OMAP4 + prompt "boot_order" + help + A command to choose the next boot device on a warm reset. + config BOARDINFO default "Archos G9" if MACH_ARCHOSG9 default "Texas Instrument's SDP343x" if MACH_OMAP343xSDP
arch/arm/mach-omap/Makefile +1 -0
@@ -30,4 +30,5 @@ obj-$(CONFIG_OMAP_GPMC) += gpmc.o devices-gpmc-nand.o obj-$(CONFIG_SHELL_NONE) += xload.o obj-$(CONFIG_MFD_TWL6030) += omap4_twl6030_mmc.o obj-$(CONFIG_OMAP4_USBBOOT) += omap4_rom_usb.o +obj-$(CONFIG_CMD_BOOT_ORDER) += boot_order.o obj-y += gpio.o
arch/arm/mach-omap/boot_order.c new file +83 -0
83 lines not on this page · raw message
arch/arm/mach-omap/include/mach/omap4-silicon.h +20 -0
@@ -161,6 +161,25 @@#define OMAP44XX_PRM_RSTCTRL_RESET 0x01/* +* SAR (Save & Rescue) memory region +*/ +#define OMAP44XX_SAR_RAM_BASE 0x4a326000 +#define OMAP44XX_SAR_CH_ADDRESS (OMAP44XX_SAR_RAM_BASE + 0xA00) +#define OMAP44XX_SAR_CH_START (OMAP44XX_SAR_RAM_BASE + 0xA0C) +#define OMAP44XX_SAR_BOOT_VOID 0x00 +#define OMAP44XX_SAR_BOOT_XIP 0x01 +#define OMAP44XX_SAR_BOOT_XIPWAIT 0x02 +#define OMAP44XX_SAR_BOOT_NAND 0x03 +#define OMAP44XX_SAR_BOOT_ONENAND 0x04 +#define OMAP44XX_SAR_BOOT_MMC1 0x05 +#define OMAP44XX_SAR_BOOT_MMC2_1 0x06 +#define OMAP44XX_SAR_BOOT_MMC2_2 0x07 +#define OMAP44XX_SAR_BOOT_UART 0x43 +#define OMAP44XX_SAR_BOOT_USB_1 0x45 +#define OMAP44XX_SAR_BOOT_USB_ULPI 0x46 +#define OMAP44XX_SAR_BOOT_USB_2 0x47 + +/* * Non-secure SRAM Addresses * Non-secure RAM starts at 0x40300000 for GP devices. But we keep SRAM_BASE * at 0x40304000(EMU base) so that our code works for both EMU and GP
@@ -212,6 +231,7 @@ void omap4_ddr_init(const struct ddr_regs *, const struct dpll_param *);void omap4_power_i2c_send (u32 );unsigned int omap4_revision (void ); noinline int omap4_scale_vcores(unsigned vsel0_pin); +void omap4_set_warmboot_order (u32 *device_list);#endif
arch/arm/mach-omap/omap4_generic.c +20 -0
@@ -41,6 +41,26 @@ void __noreturn reset_cpu(unsigned long addr)while (1 ); } +void omap4_set_warmboot_order (u32 *device_list) +{ +const u32 CH [] = { +0xCF00AA01 , +0x0000000C , + (device_list[0 ] <<16 ) |0x0000 , + (device_list[2 ] <<16 ) | device_list[1 ], +0x0000 | device_list[3 ], +0x00000000 , +0x00000000 , +0x00000000 , +0x00000000 + }; +int i; + +for (i =0 ; i <ARRAY_SIZE (CH ); i++) +writel (CH [i],OMAP44XX_SAR_CH_START + i*sizeof (CH [0 ])); +writel (OMAP44XX_SAR_CH_START ,OMAP44XX_SAR_CH_ADDRESS ); +} +#define WATCHDOG_WSPR 0x48#define WATCHDOG_WWPS 0x34
Signature · 7 lines
1.8.2.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Sascha Hauer
AppliedRe: [PATCH] OMAP4: add command to select next boot device priority
Quoted 5 lines · Vicente Bergas
On OMAP4 SoC there is a SAR memory region (Save & Rescue) where the ROM code reads the device to boot from. This patch adds a way to set this.
Signed-off-by Vicente Bergas <[email protected]>
Applied, thanks
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox