qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-13 15:41:55 +02:00
Code

* add console=tty0 to kernel command line.

Browse Source 
* when press [S], enable the UART0 and UART1, uboot will delay 3 second wait input from serial console.
 * when press [S] + [M] + [POWER], will enalbe uart then boot from sd card.

Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
This commit is contained in:
Xiangfu Liu 2010-04-20 16:25:23 +08:00
parent 73df02f0b7
commit 8ceec5f9a6
5 changed files with 78 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
package/uboot-xburst/files/board/nanonote/nanonote.c
View File

@ -57,11 +57,11 @@ static void gpio_init(void)
*/ */
if (__gpio_get_pin(GPIO_KEYIN_BASE + 2) == 0){ if (__gpio_get_pin(GPIO_KEYIN_BASE + 2) == 0){
/* if pressed [S] */ /* if pressed [S] */
printf("[S] pressed, enable UART0\n"); printf("[S] pressed, enable UART\n");
gd->boot_option = 5; gd->boot_option |= BOOT_WITH_ENABLE_UART;
__gpio_as_uart0(); __gpio_as_uart0();
__gpio_as_uart1();
} else { } else {
printf("[S] not pressed, disable UART0\n");
__gpio_as_input(GPIO_KEYIN_8); __gpio_as_input(GPIO_KEYIN_8);
__gpio_enable_pull(GPIO_KEYIN_8); __gpio_enable_pull(GPIO_KEYIN_8);
} }
@ -86,8 +86,8 @@ static void gpio_init(void)
__gpio_enable_pull(GPIO_USB_DETECT); __gpio_enable_pull(GPIO_USB_DETECT);
if (__gpio_get_pin(GPIO_KEYIN_BASE + 3) == 0) { if (__gpio_get_pin(GPIO_KEYIN_BASE + 3) == 0) {
printf("[M] pressed, boot from sd card\n"); printf("[M] pressed, boot from sd card %d\n");
gd->boot_option = 1; gd->boot_option |= BOOT_FROM_SDCARD;
} }
} }
@ -97,6 +97,7 @@ static void cpm_init(void)
__cpm_stop_cim(); __cpm_stop_cim();
__cpm_stop_i2c(); __cpm_stop_i2c();
__cpm_stop_ssi(); __cpm_stop_ssi();
if (!(gd->boot_option & BOOT_WITH_ENABLE_UART))
__cpm_stop_uart1(); __cpm_stop_uart1();
__cpm_stop_sadc(); __cpm_stop_sadc();
__cpm_stop_uhc(); __cpm_stop_uhc();
@ -117,7 +118,7 @@ int checkboard (void)
{ {
printf("Board: Qi LB60 (Ingenic XBurst Jz4740 SoC, Speed %d MHz)\n", printf("Board: Qi LB60 (Ingenic XBurst Jz4740 SoC, Speed %d MHz)\n",
gd->cpu_clk/1000000); gd->cpu_clk / 1000000);
return 0; /* success */ return 0; /* success */
} }

2
package/uboot-xburst/files/include/configs/nanonote.h
View File

@ -73,7 +73,7 @@
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */
#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LONGHELP /* undef to save memory */
#define CONFIG_SYS_PROMPT "QI# " /* Monitor Command Prompt */ #define CONFIG_SYS_PROMPT "NanoNote# " /* Monitor Command Prompt */
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
/* Print Buffer Size */ /* Print Buffer Size */

7
package/uboot-xburst/files/include/configs/qi_lb60.h
View File

@ -5,8 +5,11 @@
#define CONFIG_QI_LB60 1 #define CONFIG_QI_LB60 1
#define CONFIG_BOOTARGS "mem=32M console=ttyS0,57600n8 ubi.mtd=2 rootfstype=ubifs root=ubi0:rootfs rw rootwait" #define BOOT_FROM_SDCARD 1
#define CONFIG_BOOTARGSFROMSD "mem=32M console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p2 rw rootwait" #define BOOT_WITH_ENABLE_UART (1 << 1) /* Vaule for global_data.h gd->boot_option */
#define CONFIG_BOOTARGS "mem=32M console=tty0 console=ttyS0,57600n8 ubi.mtd=2 rootfstype=ubifs root=ubi0:rootfs rw rootwait"
#define CONFIG_BOOTARGSFROMSD "mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p2 rw rootwait"
#define CONFIG_BOOTCOMMAND "nand read 0x80600000 0x400000 0x200000;bootm" #define CONFIG_BOOTCOMMAND "nand read 0x80600000 0x400000 0x200000;bootm"
#define CONFIG_BOOTCOMMANDFROMSD "mmc init; fatload mmc 0 0x80600000 uImage; bootm" #define CONFIG_BOOTCOMMANDFROMSD "mmc init; fatload mmc 0 0x80600000 uImage; bootm"

38
package/uboot-xburst/files/nand_spl/nand_boot_jz4740.c
View File

@ -333,7 +333,6 @@ static void nand_load(int offs, int uboot_size, uchar *dst)
} }
static void jz_nand_init(void) { static void jz_nand_init(void) {
/* Optimize the timing of nand */ /* Optimize the timing of nand */
REG_EMC_SMCR1 = 0x094c4400; REG_EMC_SMCR1 = 0x094c4400;
} }
@ -343,13 +342,7 @@ static void gpio_init(void)
/* /*
* Initialize SDRAM pins * Initialize SDRAM pins
*/ */
#if defined(CONFIG_JZ4720)
__gpio_as_sdram_16bit_4720();
#elif defined(CONFIG_JZ4725)
__gpio_as_sdram_16bit_4725();
#else
__gpio_as_sdram_32bit(); __gpio_as_sdram_32bit();
#endif
/* /*
* Initialize UART0 pins * Initialize UART0 pins
@ -359,22 +352,15 @@ static void gpio_init(void)
static int is_usb_boot() static int is_usb_boot()
{ {
int keyU = 0;
__gpio_as_input(KEY_U_IN); __gpio_as_input(KEY_U_IN);
__gpio_enable_pull(KEY_U_IN); __gpio_enable_pull(KEY_U_IN);
__gpio_as_output(KEY_U_OUT); __gpio_as_output(KEY_U_OUT);
__gpio_clear_pin(KEY_U_OUT); __gpio_clear_pin(KEY_U_OUT);
keyU = __gpio_get_pin(KEY_U_IN); if (__gpio_get_pin(KEY_U_IN) == 0)
return 1;
if (keyU) return 0;
serial_puts("[U] not pressed\n");
else
serial_puts("[U] pressed\n");
return !keyU;
} }
void nand_boot(void) void nand_boot(void)
@ -384,22 +370,18 @@ void nand_boot(void)
/* /*
* Init hardware * Init hardware
*/ */
jz_nand_init();
gpio_init(); gpio_init();
serial_init();
serial_puts("\n\nNAND Secondary Program Loader\n\n");
pll_init(); pll_init();
serial_init();
sdram_init(); sdram_init();
serial_puts("\n\nNAND Secondary Program Loader\n\n");
#if defined(CONFIG_NANONOTE) #if defined(CONFIG_NANONOTE)
if(is_usb_boot()) { if(is_usb_boot()) {
serial_puts("enter USB BOOT mode\n"); serial_puts("[U] pressed, goto USBBOOT mode\n");
usb_boot(); usb_boot();
} }
#endif #endif
page_size = CONFIG_SYS_NAND_PAGE_SIZE; page_size = CONFIG_SYS_NAND_PAGE_SIZE;
block_size = CONFIG_SYS_NAND_BLOCK_SIZE; block_size = CONFIG_SYS_NAND_BLOCK_SIZE;
page_per_block = CONFIG_SYS_NAND_BLOCK_SIZE / CONFIG_SYS_NAND_PAGE_SIZE; page_per_block = CONFIG_SYS_NAND_BLOCK_SIZE / CONFIG_SYS_NAND_PAGE_SIZE;
@ -417,13 +399,9 @@ void nand_boot(void)
serial_puts("Starting U-Boot ...\n"); serial_puts("Starting U-Boot ...\n");
/* /* Flush caches */
* Flush caches
*/
flush_cache_all(); flush_cache_all();
/* /* Jump to U-Boot image */
* Jump to U-Boot image
*/
(*uboot)(); (*uboot)();
} }

78
package/uboot-xburst/patches/001-xburst.patch
View File

@ -5,11 +5,11 @@ From: Xiangfu Liu <xiangfu@sharism.cc>
--- ---
Makefile | 10 + Makefile | 16 +
common/env_common.c | 2 common/env_common.c | 7 -
common/lcd.c | 45 ++++ common/lcd.c | 45 ++++
common/main.c | 4 common/main.c | 11 +
cpu/mips/Makefile | 4 cpu/mips/Makefile | 3
cpu/mips/cache.S | 280 ++++++++++---------------- cpu/mips/cache.S | 280 ++++++++++----------------
cpu/mips/config.mk | 6 - cpu/mips/config.mk | 6 -
cpu/mips/cpu.c | 75 +++++++ cpu/mips/cpu.c | 75 +++++++
@ -17,16 +17,16 @@ From: Xiangfu Liu <xiangfu@sharism.cc>
drivers/mtd/nand/nand_base.c | 88 ++++++++ drivers/mtd/nand/nand_base.c | 88 ++++++++
examples/standalone/mips.lds | 2 examples/standalone/mips.lds | 2
include/asm-mips/addrspace.h | 2 include/asm-mips/addrspace.h | 2
include/asm-mips/global_data.h | 11 + include/asm-mips/global_data.h | 12 +
include/lcd.h | 56 +++++ include/lcd.h | 56 +++++
lib_mips/board.c | 18 +- lib_mips/board.c | 18 +-
lib_mips/bootm.c | 7 + lib_mips/bootm.c | 12 +
lib_mips/time.c | 4 lib_mips/time.c | 4
20 files changed, 800 insertions(+), 333 deletions(-) 17 files changed, 778 insertions(+), 291 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index f06a97c..a318eb4 100644 index f06a97c..3d87cd1 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -3439,6 +3439,22 @@ qemu_mips_config : unconfig @@ -3439,6 +3439,22 @@ qemu_mips_config : unconfig
@ -53,10 +53,11 @@ index f06a97c..a318eb4 100644
######################################################################### #########################################################################
diff --git a/common/env_common.c b/common/env_common.c diff --git a/common/env_common.c b/common/env_common.c
index 439a4a9..6cfe30b 100644 index 439a4a9..905d16a 100644
--- a/common/env_common.c --- a/common/env_common.c
+++ b/common/env_common.c +++ b/common/env_common.c
@@ -134,7 +134,10 @@ uchar default_environment[] = { @@ -133,8 +133,11 @@ uchar default_environment[] = {
#if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0)
"pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0" "pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0"
#endif #endif
-#ifdef CONFIG_EXTRA_ENV_SETTINGS -#ifdef CONFIG_EXTRA_ENV_SETTINGS
@ -176,33 +177,36 @@ index 4e31618..ddd5aa8 100644
} }
diff --git a/common/main.c b/common/main.c diff --git a/common/main.c b/common/main.c
index 10d8904..ff11ad7 100644 index 10d8904..76641f3 100644
--- a/common/main.c --- a/common/main.c
+++ b/common/main.c +++ b/common/main.c
@@ -372,7 +372,9 @@ void main_loop (void) @@ -372,7 +372,11 @@ void main_loop (void)
#if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0) #if defined(CONFIG_BOOTDELAY) && (CONFIG_BOOTDELAY >= 0)
s = getenv ("bootdelay"); s = getenv ("bootdelay");
bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY; bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
- -
+#if defined(CONFIG_NANONOTE)
+ DECLARE_GLOBAL_DATA_PTR; + DECLARE_GLOBAL_DATA_PTR;
+ if (gd->boot_option == 5) + if (gd->boot_option & BOOT_WITH_ENABLE_UART)
+ bootdelay = gd->boot_option; + bootdelay = 3;
+# endif
debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay); debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay);
# ifdef CONFIG_BOOT_RETRY_TIME # ifdef CONFIG_BOOT_RETRY_TIME
@@ -393,7 +395,9 @@ void main_loop (void) @@ -393,7 +397,10 @@ void main_loop (void)
} }
else else
#endif /* CONFIG_BOOTCOUNT_LIMIT */ #endif /* CONFIG_BOOTCOUNT_LIMIT */
- s = getenv ("bootcmd"); - s = getenv ("bootcmd");
+ s = gd->boot_option == 1 ? + if (gd->boot_option & BOOT_FROM_SDCARD)
+ getenv ("bootcmdfromsd"): + s = getenv ("bootcmdfromsd");
+ getenv ("bootcmd") ; + else
+ s = getenv ("bootcmd");
debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>"); debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
diff --git a/cpu/mips/Makefile b/cpu/mips/Makefile diff --git a/cpu/mips/Makefile b/cpu/mips/Makefile
index 28a1cbb..5207bc5 100644 index 28a1cbb..afeb909 100644
--- a/cpu/mips/Makefile --- a/cpu/mips/Makefile
+++ b/cpu/mips/Makefile +++ b/cpu/mips/Makefile
@@ -33,6 +33,9 @@ SOBJS-$(CONFIG_INCA_IP) += incaip_wdt.o @@ -33,6 +33,9 @@ SOBJS-$(CONFIG_INCA_IP) += incaip_wdt.o
@ -687,7 +691,7 @@ index d5a1604..48e1cea 100644
+} +}
+#endif /* CONFIG_JzRISC */ +#endif /* CONFIG_JzRISC */
diff --git a/cpu/mips/start.S b/cpu/mips/start.S diff --git a/cpu/mips/start.S b/cpu/mips/start.S
index 57db589..fa6e352 100644 index 57db589..33c05b4 100644
--- a/cpu/mips/start.S --- a/cpu/mips/start.S
+++ b/cpu/mips/start.S +++ b/cpu/mips/start.S
@@ -23,32 +23,33 @@ @@ -23,32 +23,33 @@
@ -1270,7 +1274,7 @@ index 57db589..fa6e352 100644
+ +
+#endif /* CONFIG_JZ4730 */ +#endif /* CONFIG_JZ4730 */
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 426bb95..6e5fbd3 100644 index 426bb95..23a1856 100644
--- a/drivers/mtd/nand/nand_base.c --- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c
@@ -109,6 +109,22 @@ static struct nand_ecclayout nand_oob_16 = { @@ -109,6 +109,22 @@ static struct nand_ecclayout nand_oob_16 = {
@ -1427,10 +1431,10 @@ index 3a1e6d6..2ee6920 100644
cannot access physical memory directly from core */ cannot access physical memory directly from core */
#define UNCACHED_SDRAM(a) (((unsigned long)(a)) | 0x20000000) #define UNCACHED_SDRAM(a) (((unsigned long)(a)) | 0x20000000)
diff --git a/include/asm-mips/global_data.h b/include/asm-mips/global_data.h diff --git a/include/asm-mips/global_data.h b/include/asm-mips/global_data.h
index b2c4891..23f597e 100644 index b2c4891..9f93fb4 100644
--- a/include/asm-mips/global_data.h --- a/include/asm-mips/global_data.h
+++ b/include/asm-mips/global_data.h +++ b/include/asm-mips/global_data.h
@@ -39,6 +39,17 @@ @@ -39,6 +39,18 @@
typedef struct global_data { typedef struct global_data {
bd_t *bd; bd_t *bd;
unsigned long flags; unsigned long flags;
@ -1442,8 +1446,9 @@ index b2c4891..23f597e 100644
+ unsigned long mem_clk; /* Memory bus clock */ + unsigned long mem_clk; /* Memory bus clock */
+ unsigned long dev_clk; /* Device clock */ + unsigned long dev_clk; /* Device clock */
+ unsigned long fb_base; /* base address of framebuffer */ + unsigned long fb_base; /* base address of framebuffer */
+ unsigned long boot_option; /* 1: boot from sd +#endif
+ * 5: boot delay for 5 secs*/ +#if defined(CONFIG_NANONOTE)
+ unsigned long boot_option;
+#endif +#endif
unsigned long baudrate; unsigned long baudrate;
unsigned long have_console; /* serial_init() was called */ unsigned long have_console; /* serial_init() was called */
@ -1623,25 +1628,33 @@ index b2d113e..87cb12d 100644
bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */ bd->bi_flashoffset = monitor_flash_len; /* reserved area for U-Boot */
#else #else
diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c diff --git a/lib_mips/bootm.c b/lib_mips/bootm.c
index 54af24c..64bcad9 100644 index 54af24c..b498ae8 100644
--- a/lib_mips/bootm.c --- a/lib_mips/bootm.c
+++ b/lib_mips/bootm.c +++ b/lib_mips/bootm.c
@@ -46,7 +46,9 @@ static void linux_env_set (char * env_name, char * env_val); @@ -46,10 +46,17 @@ static void linux_env_set (char * env_name, char * env_val);
int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
{ {
void (*theKernel) (int, char **, char **, int *); void (*theKernel) (int, char **, char **, int *);
- char *commandline = getenv ("bootargs"); - char *commandline = getenv ("bootargs");
+ char *commandline = gd->boot_option == 1 ? + char *commandline;
+ getenv ("bootargsfromsd") :
+ getenv ("bootargs");
char env_buf[12]; char env_buf[12];
char *cp; char *cp;
@@ -98,6 +100,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +#if defined(CONFIG_NANONOTE)
+ if (gd->boot_option & BOOT_FROM_SDCARD)
+ commandline = getenv ("bootargsfromsd");
+ else
+#endif
+ commandline = getenv ("bootargs");
+
if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
return 1;
@@ -98,6 +105,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
} }
/* we assume that the kernel is in place */ /* we assume that the kernel is in place */
+ if (gd->boot_option == 1) + if (gd->boot_option == BOOT_FROM_SDCARD)
+ printf ("\n *** Booting from mircoSD ***\n"); + printf ("\n *** Booting from mircoSD ***\n");
+ +
printf ("\nStarting kernel ...\n\n"); printf ("\nStarting kernel ...\n\n");
@ -1666,4 +1679,3 @@ index 07e356d..4654bf4 100644
} }
+ +
+#endif /* !CONFIG_JzRISC */ +#endif /* !CONFIG_JzRISC */