tricorder: remove lcdmode from bootargs
PATCH 1/13 tricorder: remove lcdmode from bootargs
From: Thomas Weber <[email protected]>
--- include/configs/tricorder.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
include/configs/tricorder.h +1 -4
@@ -147,14 +147,12 @@"loadaddr=0x82000000\0" \"console=ttyO2,115200n8\0" \"mmcdev=0\0" \ -"vram=12M\0" \ -"lcdmode=800x600\0" \ +"vram=3M\0" \"defaultdisplay=lcd\0" \"kernelopts=rw rootwait\0" \"commonargs=" \"setenv bootargs console=${console} " \"vram=${vram} " \ -"omapfb.mode=lcd:${lcdmode} " \"omapdss.def_disp=${defaultdisplay}\0" \"mmcargs=" \"run commonargs; " \
@@ -164,7 +162,6 @@"nandargs=" \"run commonargs; " \"setenv bootargs ${bootargs} " \ -"omapfb.mode=lcd:${lcdmode} " \"omapdss.def_disp=${defaultdisplay} " \"root=ubi0:root " \"ubi.mtd=4 " \
Signature · 1 line
1.7.10.4
PATCH 2/13 tricorder: update flash partitioning
From: Andreas Bie?mann <[email protected]>
The new flash layout respects posible bad blocks in sectors reserved for e.g. SPL, u-boot, kernel, env a.s.o.
Additionally this patch prepares for U-Boot Falcon mode for boot time saving.
--- include/configs/tricorder.h | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-)
include/configs/tricorder.h +22 -18
@@ -53,8 +53,6 @@#define CONFIG_OF_LIBFDT /* Size of malloc() pool */ -#define CONFIG_ENV_SIZE (128 << 10)/* 128 KiB */ -/* Sector */ #define CONFIG_SYS_MALLOC_LEN (1024*1024)/* Hardware drivers */
@@ -92,13 +90,16 @@/* Board NAND Info */ #define CONFIG_SYS_NO_FLASH /* no NOR flash */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ -#define MTDIDS_DEFAULT "nand0=nand" -#define MTDPARTS_DEFAULT "mtdparts=nand:" \ - "512k(u-boot-spl)," \ - "1920k(u-boot)," \ - "128k(u-boot-env)," \ - "4m(kernel)," \ - "-(fs)" +#define MTDIDS_DEFAULT "nand0=omap2-nand.0" +#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:" \ + "128k(SPL)," \ + "1m(u-boot)," \ + "384k(u-boot-env1)," \ + "1152k(mtdoops)," \ + "384k(u-boot-env2)," \ + "5m(kernel)," \ + "2m(fdt)," \ + "-(ubi)"#define CONFIG_NAND_OMAP_GPMC #define CONFIG_SYS_NAND_ADDR NAND_BASE/* physical address */
@@ -152,6 +153,7 @@"kernelopts=rw rootwait\0" \"commonargs=" \"setenv bootargs console=${console} " \ +"${mtdparts} " \"vram=${vram} " \"omapdss.def_disp=${defaultdisplay}\0" \"mmcargs=" \
@@ -164,26 +166,26 @@"setenv bootargs ${bootargs} " \"omapdss.def_disp=${defaultdisplay} " \"root=ubi0:root " \ -"ubi.mtd=4 " \ +"ubi.mtd=7 " \"rootfstype=ubifs " \"${kernelopts}\0" \"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \"bootscript=echo Running bootscript from mmc ...; " \"source ${loadaddr}\0" \"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ -"eraseenv=nand unlock 0x260000 0x20000; nand erase 0x260000 0x20000\0" \"mmcboot=echo Booting from mmc ...; " \"run mmcargs; " \"bootm ${loadaddr}\0" \"loaduimage_ubi=mtd default; " \ -"ubi part fs; " \ +"ubi part ubi; " \"ubifsmount ubi:root; " \"ubifsload ${loadaddr} /boot/uImage\0" \"nandboot=echo Booting from nand ...; " \"run nandargs; " \"run loaduimage_ubi; " \"bootm ${loadaddr}\0" \ -"autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \ +"autoboot=mtdparts default;" \ +"mmc dev ${mmcdev}; if mmc rescan; then " \"if run loadbootscript; then " \"run bootscript; " \"else " \
@@ -194,7 +196,6 @@"fi; " \"else run nandboot; fi\0" - #define CONFIG_BOOTCOMMAND "run autoboot"/* Miscellaneous configurable options */
@@ -236,8 +237,11 @@#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 2 sectors */ -#define CONFIG_ENV_IS_IN_NAND 1 -#define CONFIG_ENV_OFFSET 0x260000/* environment starts here */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x120000/* env start */ +#define CONFIG_ENV_OFFSET_REDUND 0x2A0000/* redundant env start */ +#define CONFIG_ENV_SIZE (16 << 10)/* use 16KiB for env */ +#define CONFIG_ENV_RANGE (384 << 10)/* allow badblocks in env */ #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1#define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800
@@ -298,8 +302,8 @@#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 -#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000 +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 +#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x100000#define CONFIG_SYS_SPL_MALLOC_START 0x80208000#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000/* 1 MB */
Signature · 1 line
1.7.10.4
PATCH 3/13 tricorder: use generic provided loadaddr
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
--- include/configs/tricorder.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/configs/tricorder.h +4 -1
@@ -144,8 +144,11 @@#define CONFIG_BOOTDELAY 3 +/* the loadaddr is the same as CONFIG_SYS_LOAD_ADDR, unfortunately the defiend +* value can not be used here! */ +#define CONFIG_LOADADDR 0x82000000 +#define CONFIG_EXTRA_ENV_SETTINGS \ - "loadaddr=0x82000000\0" \ "console=ttyO2,115200n8\0" \ "mmcdev=0\0" \ "vram=3M\0" \
Signature · 1 line
1.7.10.4
PATCH 4/13 tricorder: add configuration for a flashcard u-boot
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
The 'flashcard' u-boot configuration has a readonly environment and boots a bare kernel/initrd to program the device from an clean environment.
--- boards.cfg | 1 + include/configs/tricorder.h | 71 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 57 insertions(+), 15 deletions(-)
boards.cfg +1 -0
@@ -315,6 +315,7 @@ omap3_sdp3430 arm armv7 sdp3430 ti devkit8000 arm armv7 devkit8000 timll omap3 mcx arm armv7 mcx htkw omap3 tricorder arm armv7 tricorder corscience omap3 +tricorder_flashcard arm armv7 tricorder corscience omap3 tricorder:FLASHCARD twister arm armv7 twister technexion omap3 nokia_rx51 arm armv7 rx51 nokia omap3 omap4_panda arm armv7 panda ti omap4
include/configs/tricorder.h +56 -15
114 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 4/13 tricorder: add configuration for a flashcard u-boot
Dear Andreas Bie?mann,
Quoted 3 lines · In message <[email protected]>…
The 'flashcard' u-boot configuration has a readonly environment and boots a bare kernel/initrd to program the device from an clean environment.
What exactly is a 'flashcard' ?
Quoted 2 lines
+/* environment placement (for NAND), is different for FLASHCARD but does not
+ * harm there */
Incorrect multiline comment style.
Quoted 2 lines
/* the loadaddr is the same as
CONFIG_SYS_LOAD_ADDR, unfortunately the defiend
* value can not be used here! */
Ditto. Please fix globally.
Quoted 3 lines
+/* specific environment settings for different use cases
+ * FLASHCARD: used to run a rdimage from sdcard to program the device
+ * 'NORMAL': used to boot kernel from sdcard, nand, ...
And again...
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de One difference between a man and a machine is that a machine is quiet when well oiled.
PATCH 4/13 tricorder: add configuration for a flashcard u-boot
Dear Wolfgang Denk,
Quoted 8 lines · Wolfgang Denk
Dear Andreas Bie?mann,
Quoted 3 lines · In message <[email protected]>…
The 'flashcard' u-boot configuration has a readonly environment and boots a bare kernel/initrd to program the device from an clean environment.
What exactly is a 'flashcard' ?
a specific u-boot variant with compiled in environment. So it ignores environment on devices while upgrading.
Quoted 9 lines
Quoted 2 lines
+/* environment placement (for NAND), is different for FLASHCARD but does not
+ * harm there */Incorrect multiline comment style.
Quoted 2 lines
/* the loadaddr is the same as
CONFIG_SYS_LOAD_ADDR, unfortunately the defiend
* value can not be used here! */Ditto. Please fix globally.
Will do.
Best regards
Andreas Bie?mann
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130911/f2a671ee/attachment.pgp>
PATCH 5/13 tricorder: add cmdline history
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
--- include/configs/tricorder.h | 1 + 1 file changed, 1 insertion(+)
include/configs/tricorder.h +1 -0
@@ -251,6 +251,7 @@/* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ +#define CONFIG_CMDLINE_EDITING /* enable cmdline history */ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_PROMPT "OMAP3 Tricorder # "#define CONFIG_SYS_CBSIZE 512/* Console I/O Buffer Size */
Signature · 1 line
1.7.10.4
PATCH 6/13 tricorder: add mtdparts to environment
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
Before we always ran 'mtdparts default' which also set the mtdparts and mtdids environment. But if we changed that values by intention we will overwrite them with our default values. This is obviously bad!
--- include/configs/tricorder.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
include/configs/tricorder.h +4 -5
@@ -160,6 +160,8 @@"vram=3M\0" \"defaultdisplay=lcd\0" \"kernelopts=mtdoops.mtddev=3\0" \ +"mtdparts=" MTDPARTS_DEFAULT "\0" \ +"mtdids=" MTDIDS_DEFAULT "\0" \"commonargs=" \"setenv bootargs console=${console} " \"${mtdparts} " \
@@ -188,7 +190,6 @@CONFIG_COMMON_ENV_SETTINGS \ CONFIG_ENV_RDADDR \"autoboot=" \ -"mtdparts default; " \"run commonargs; " \"setenv bootargs ${bootargs} " \"flashy_updateimg=/dev/mmcblk0p1:corscience_update.img " \
@@ -226,16 +227,14 @@"mmcboot=echo Booting from mmc ...; " \"run mmcargs; " \"bootm ${loadaddr}\0" \ -"loaduimage_ubi=mtd default; " \ -"ubi part ubi; " \ +"loaduimage_ubi=ubi part ubi; " \"ubifsmount ubi:root; " \"ubifsload ${loadaddr} /boot/uImage\0" \"nandboot=echo Booting from nand ...; " \"run nandargs; " \"run loaduimage_ubi; " \"bootm ${loadaddr}\0" \ -"autoboot=mtdparts default;" \ -"mmc dev ${mmcdev}; if mmc rescan; then " \ +"autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \"if run loadbootscript; then " \"run bootscript; " \"else " \
Signature · 1 line
1.7.10.4
PATCH 7/13 tricorder: add tricordereeprom command
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
The new tricordereeprom command can read and write the eeprom for hardware detection on tricorder devices.
--- board/corscience/tricorder/Makefile | 2 +- board/corscience/tricorder/tricorder-eeprom.c | 251 +++++++++++++++++++++++++ board/corscience/tricorder/tricorder-eeprom.h | 41 ++++ include/configs/tricorder.h | 7 + 4 files changed, 300 insertions(+), 1 deletion(-) create mode 100644 board/corscience/tricorder/tricorder-eeprom.c create mode 100644 board/corscience/tricorder/tricorder-eeprom.h
board/corscience/tricorder/Makefile +1 -1
@@ -12,7 +12,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := tricorder.o +COBJS := tricorder.o tricorder-eeprom.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/corscience/tricorder/tricorder-eeprom.c new file +251 -0
251 lines not on this page · raw message
board/corscience/tricorder/tricorder-eeprom.h new file +41 -0
41 lines not on this page · raw message
include/configs/tricorder.h +7 -0
@@ -82,6 +82,13 @@#define CONFIG_SYS_I2C_SPEED 100000#define CONFIG_SYS_I2C_SLAVE 1#define CONFIG_DRIVER_OMAP34XX_I2C 1 +#define CONFIG_I2C_MULTI_BUS + +/* EEPROM */ +#define CONFIG_SYS_I2C_MULTI_EEPROMS +#define CONFIG_CMD_EEPROM +#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 +#define CONFIG_SYS_EEPROM_BUS_NUM 1/* TWL4030 */ #define CONFIG_TWL4030_POWER
Signature · 1 line
1.7.10.4
PATCH 8/13 tricorder: panic() on unknown board
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
Also hang() the board on panic().
--- board/corscience/tricorder/tricorder.c | 77 ++++++++++++++++++++++++++++++++ include/configs/tricorder.h | 7 +++ 2 files changed, 84 insertions(+)
board/corscience/tricorder/tricorder.c +77 -0
@@ -13,11 +13,13 @@#include <common.h> #include <twl4030.h> #include <asm/io.h> +#include <asm/gpio.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/mux.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mem.h> #include "tricorder.h" +#include "tricorder-eeprom.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -34,12 +36,87 @@ int board_init(void)return 0 ; } +/** +* get_eeprom - read the eeprom +* +* @eeprom - pointer to a eeprom struct to fill +* +* This function will panic() on wrong EEPROM content +*/ +static void get_eeprom (struct tricorder_eeprom *eeprom) +{ +int ret; + +if (!eeprom) +panic ("No eeprom given!\n" ); + + ret =gpio_request (7 ,"BMS" ); +if (ret) +panic ("gpio: requesting BMS pin failed\n" ); + + ret =gpio_direction_input (7 ); +if (ret) +panic ("gpio: set BMS as input failed\n" ); + + ret =gpio_get_value (7 ); +if (ret <0 ) +panic ("gpio: get BMS pin state failed\n" ); + +gpio_free (7 ); + +if (ret ==0 ) { +/* BMS is _not_ set, do the EEPROM check */ + ret =tricorder_get_eeprom (0x51 , eeprom); +if (!ret) { +if (strncmp (eeprom->board_name,"CS10411" ,7 ) !=0 ) +panic ("Wrong board name '%.*s'\n" , +sizeof (eeprom->board_name), + eeprom->board_name); +if (eeprom->board_version[0 ] <'D' ) +panic ("Wrong board version '%.*s'\n" , +sizeof (eeprom->board_version), + eeprom->board_version); + }else { +panic ("Could not get board revision\n" ); + } + } +} + +/** +* print_hwversion - print out a HW version string +* +* @eeprom - pointer to the eeprom +*/ +static void print_hwversion (struct tricorder_eeprom *eeprom) +{ +size_t len; +if (!eeprom) +panic ("No eeprom given!" ); + +printf ("Board %.*s:%.*s serial %.*s" , +sizeof (eeprom->board_name), eeprom->board_name, +sizeof (eeprom->board_version), eeprom->board_version, +sizeof (eeprom->board_serial), eeprom->board_serial); + + len =strnlen (eeprom->interface_version, +sizeof (eeprom->interface_version)); +if (len >0 ) +printf (" HW interface version %.*s" , +sizeof (eeprom->interface_version), + eeprom->interface_version); +puts ("\n" ); +} +/* * Routine: misc_init_r * Description: Configure board specific parts */ int misc_init_r (void ) { +struct tricorder_eeprom eeprom; +get_eeprom (&eeprom); +print_hwversion (&eeprom); +twl4030_power_init ();#ifdef CONFIG_TWL4030_LED twl4030_led_init (TWL4030_LED_LEDEN_LEDAON |TWL4030_LED_LEDEN_LEDBON );
include/configs/tricorder.h +7 -0
@@ -57,6 +57,9 @@/* Hardware drivers */ +/* GPIO support */ +#define CONFIG_OMAP_GPIO +/* NS16550 Configuration */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL
@@ -150,6 +153,9 @@#define CONFIG_BOOTDELAY 3 +/* hang() the board on panic() */ +#define CONFIG_PANIC_HANG +/* environment placement (for NAND), is different for FLASHCARD but does not * harm there */ #define CONFIG_ENV_OFFSET 0x120000/* env start */
@@ -311,6 +317,7 @@#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_BOARD_INIT +#define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_LIBDISK_SUPPORT #define CONFIG_SPL_I2C_SUPPORT
Signature · 1 line
1.7.10.4
PATCH 9/13 tricorder: add led support
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
--- board/corscience/tricorder/Makefile | 2 +- board/corscience/tricorder/led.c | 80 ++++++++++++++++++++++++++++++++ board/corscience/tricorder/tricorder.c | 6 +-- board/corscience/tricorder/tricorder.h | 4 +- include/configs/tricorder.h | 14 ++++++ 5 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 board/corscience/tricorder/led.c
board/corscience/tricorder/Makefile +1 -1
@@ -12,7 +12,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := tricorder.o tricorder-eeprom.o +COBJS := tricorder.o tricorder-eeprom.o led.o SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/corscience/tricorder/led.c new file +80 -0
80 lines not on this page · raw message
board/corscience/tricorder/tricorder.c +3 -3
@@ -118,9 +118,9 @@ int misc_init_r(void)print_hwversion (&eeprom);twl4030_power_init (); -#ifdef CONFIG_TWL4030_LED -twl4030_led_init (TWL4030_LED_LEDEN_LEDAON |TWL4030_LED_LEDEN_LEDBON ); -#endif +status_led_set (0 ,STATUS_LED_ON ); +status_led_set (1 ,STATUS_LED_ON ); +status_led_set (2 ,STATUS_LED_ON );dieid_num_r ();
board/corscience/tricorder/tricorder.h +2 -2
@@ -75,8 +75,8 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(GPMC_A6), (IDIS | PTD | DIS | M0)) /*GPMC_A6*/\ MUX_VAL(CP(GPMC_A7), (IDIS | PTD | DIS | M0)) /*GPMC_A7*/\ MUX_VAL(CP(GPMC_A8), (IDIS | PTD | DIS | M0)) /*GPMC_A8*/\ - MUX_VAL(CP(GPMC_A9), (IDIS | PTD | DIS | M0)) /*GPMC_A9*/\ - MUX_VAL(CP(GPMC_A10), (IDIS | PTD | DIS | M0)) /*GPMC_A10*/\ + MUX_VAL(CP(GPMC_A9), (IDIS | PTU | EN | M4)) /*GPIO 42*/\ + MUX_VAL(CP(GPMC_A10), (IDIS | PTU | EN | M4)) /*GPIO 43*/\ MUX_VAL(CP(GPMC_D0), (IEN | PTD | DIS | M0)) /*GPMC_D0*/\ MUX_VAL(CP(GPMC_D1), (IEN | PTD | DIS | M0)) /*GPMC_D1*/\MUX_VAL (CP (GPMC_D2 ), (IEN |PTD |DIS |M0 ))/*GPMC_D2*/ \
include/configs/tricorder.h +14 -0
@@ -60,6 +60,20 @@/* GPIO support */ #define CONFIG_OMAP_GPIO +/* LED support */ +#define CONFIG_STATUS_LED +#define CONFIG_BOARD_SPECIFIC_LED +#define CONFIG_CMD_LED /* LED command */ +#define STATUS_LED_BIT (1 << 0) +#define STATUS_LED_STATE STATUS_LED_ON +#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) +#define STATUS_LED_BIT1 (1 << 1) +#define STATUS_LED_STATE1 STATUS_LED_ON +#define STATUS_LED_PERIOD1 (CONFIG_SYS_HZ / 2) +#define STATUS_LED_BIT2 (1 << 2) +#define STATUS_LED_STATE2 STATUS_LED_ON +#define STATUS_LED_PERIOD2 (CONFIG_SYS_HZ / 2) +/* NS16550 Configuration */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL
Signature · 1 line
1.7.10.4
PATCH 10/13 tricorder: Make u-boot faster
In reply to Andreas BießmannFrom: Thomas Weber <[email protected]>
Silent u-boot and no bootdelay
--- include/configs/tricorder.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
include/configs/tricorder.h +4 -1
@@ -39,6 +39,9 @@#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SILENT_CONSOLE +#define CONFIG_ZERO_BOOTDELAY_CHECK +/* Clock Defines */ #define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1)
@@ -165,7 +168,7 @@/* Environment information (this is the common part) */ -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 0/* hang() the board on panic() */ #define CONFIG_PANIC_HANG
Signature · 1 line
1.7.10.4
PATCH 11/13 tricorder: switch to alternative memtest
In reply to Andreas BießmannFrom: Thomas Weber <[email protected]>
Increase the tested memory region for mtest and define CONFIG_SYS_MEMTEST_SCRATCH for CONFIG_SYS_ALT_MEMTEST
--- include/configs/tricorder.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/configs/tricorder.h +4 -2
@@ -292,9 +292,9 @@/* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) -#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0 + 0x07000000) +#define CONFIG_SYS_MEMTEST_START (OMAP34XX_SDRC_CS0 + 0x00000000)#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + \ - 0x01000000)/* 16MB */ + 0x07000000)/* 112 MB */ #define CONFIG_SYS_LOAD_ADDR (OMAP34XX_SDRC_CS0 + 0x02000000)
@@ -383,4 +383,6 @@#define CONFIG_SYS_SPL_MALLOC_START 0x80208000#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000/* 1 MB */ +#define CONFIG_SYS_ALT_MEMTEST +#define CONFIG_SYS_MEMTEST_SCRATCH 0x81000000#endif /* __CONFIG_H */
Signature · 1 line
1.7.10.4
PATCH 12/13 tricorder: read kernel directly from NAND
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
--- include/configs/tricorder.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/configs/tricorder.h +2 -1
@@ -260,9 +260,10 @@"loaduimage_ubi=ubi part ubi; " \"ubifsmount ubi:root; " \"ubifsload ${loadaddr} /boot/uImage\0" \ +"loaduimage_nand=nand read ${loadaddr} kernel 0x500000\0" \"nandboot=echo Booting from nand ...; " \"run nandargs; " \ -"run loaduimage_ubi; " \ +"run loaduimage_nand; " \"bootm ${loadaddr}\0" \"autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \"if run loadbootscript; then " \
Signature · 1 line
1.7.10.4
PATCH 13/13 tricorder: support 256MiB SDRAM on revision > D
In reply to Andreas BießmannFrom: Andreas Bie?mann <[email protected]>
--- board/corscience/tricorder/tricorder.c | 45 +++++++++++++++++++++++++++----- include/configs/tricorder.h | 2 +- 2 files changed, 39 insertions(+), 8 deletions(-)
board/corscience/tricorder/tricorder.c +38 -7
@@ -154,12 +154,43 @@ int board_mmc_init(bd_t *bis)*/ void get_board_mem_timings (struct board_sdrc_timings *timings) { -/* General SDRC config */ - timings->mcfg =MICRON_V_MCFG_165 (128 <<20 ); - timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; +struct tricorder_eeprom eeprom; +get_eeprom (&eeprom); -/* AC timings */ - timings->ctrla =MICRON_V_ACTIMA_165 ; - timings->ctrlb =MICRON_V_ACTIMB_165 ; - timings->mr =MICRON_V_MR_165 ; +/* General SDRC config */ +if (eeprom.board_version[0 ] >'D' ) { +/* use optimized timings for our SDRAM device */ + timings->mcfg =MCFG ((256 <<20 ),14 ); +#define MT46H64M32_TDAL 6/* Twr/Tck + Trp/tck */ +/* 15/6 + 18/6 = 5.5 -> 6 */ +#define MT46H64M32_TDPL 3/* 15/6 = 2.5 -> 3 (Twr) */ +#define MT46H64M32_TRRD 2/* 12/6 = 2 */ +#define MT46H64M32_TRCD 3/* 18/6 = 3 */ +#define MT46H64M32_TRP 3/* 18/6 = 3 */ +#define MT46H64M32_TRAS 7/* 42/6 = 7 */ +#define MT46H64M32_TRC 10/* 60/6 = 10 */ +#define MT46H64M32_TRFC 12/* 72/6 = 12 */ + timings->ctrla =ACTIM_CTRLA (MT46H64M32_TRFC ,MT46H64M32_TRC , +MT46H64M32_TRAS ,MT46H64M32_TRP , +MT46H64M32_TRCD ,MT46H64M32_TRRD , +MT46H64M32_TDPL , +MT46H64M32_TDAL ); + +#define MT46H64M32_TWTR 1 +#define MT46H64M32_TCKE 1 +#define MT46H64M32_XSR 19/* 112.5/6 = 18.75 => ~19 */ +#define MT46H64M32_TXP 1 + timings->ctrlb =ACTIM_CTRLB (MT46H64M32_TWTR ,MT46H64M32_TCKE , +MT46H64M32_TXP ,MT46H64M32_XSR ); + + timings->mr =MICRON_V_MR_165 ; + timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; + }else { +/* use conservative beagleboard timings as default */ + timings->mcfg =MICRON_V_MCFG_165 (128 <<20 ); + timings->ctrla =MICRON_V_ACTIMA_165 ; + timings->ctrlb =MICRON_V_ACTIMB_165 ; + timings->mr =MICRON_V_MR_165 ; + timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; + } }
include/configs/tricorder.h +1 -1
@@ -354,7 +354,7 @@#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300/* address 0x60000 */ #define CONFIG_SPL_TEXT_BASE 0x40200000/*CONFIG_SYS_SRAM_START*/ -#define CONFIG_SPL_MAX_SIZE (55 * 1024)/* 7 KB for stack */ +#define CONFIG_SPL_MAX_SIZE (57 * 1024)/* 7 KB for stack */ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK#define CONFIG_SPL_BSS_START_ADDR 0x80000000/*CONFIG_SYS_SDRAM_BASE*/
Signature · 1 line
1.7.10.4
PATCH 1/13 tricorder: remove lcdmode from bootargs
In reply to Andreas BießmannQuoted 4 lines · Andreas Bie??mann
From: Thomas Weber <[email protected]>
Signed-off-by Thomas Weber <[email protected]>Signed-off-by Andreas Bie??mann <[email protected]>
Applied to u-boot-ti/master along with the rest of the series, thanks!
Signature · 8 lines
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/20131104/009c2261/attachment.pgp>