parent
d5a108ece3
commit
17f9b2c9ac
|
@ -25,4 +25,4 @@ endchoice
|
||||||
source common/Kconfig
|
source common/Kconfig
|
||||||
source net/Kconfig
|
source net/Kconfig
|
||||||
source drivers/Kconfig
|
source drivers/Kconfig
|
||||||
|
source fs/Kconfig
|
||||||
|
|
|
@ -1,18 +1,24 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <command.h>
|
||||||
#include <watchdog.h>
|
#include <watchdog.h>
|
||||||
|
#include <image.h>
|
||||||
|
#include <environment.h>
|
||||||
|
#include <asm/global_data.h>
|
||||||
|
#include <asm/bitops.h>
|
||||||
|
|
||||||
#ifdef CONFIG_OF_FLAT_TREE
|
#ifdef CONFIG_OF_FLAT_TREE
|
||||||
#include <ft_build.h>
|
#include <ft_build.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void __attribute__((noinline))
|
void __attribute__((noinline))
|
||||||
do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
||||||
int argc, char *argv[],
|
int argc, char *argv[],
|
||||||
ulong addr,
|
ulong addr,
|
||||||
ulong *len_ptr,
|
ulong *len_ptr,
|
||||||
int verify)
|
int verify)
|
||||||
{
|
{
|
||||||
|
#if 0
|
||||||
ulong sp;
|
ulong sp;
|
||||||
ulong len, checksum;
|
ulong len, checksum;
|
||||||
ulong initrd_start, initrd_end;
|
ulong initrd_start, initrd_end;
|
||||||
|
@ -458,5 +464,6 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag,
|
||||||
|
|
||||||
(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
|
(*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0);
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -84,17 +84,6 @@ static int devices_init (void)
|
||||||
|
|
||||||
device_initcall(devices_init);
|
device_initcall(devices_init);
|
||||||
|
|
||||||
/* Do not collide with the env from our first stage loader for now */
|
|
||||||
static char *env_spec = "nor0:0+128k";
|
|
||||||
|
|
||||||
static int init_env(void)
|
|
||||||
{
|
|
||||||
add_env_spec(env_spec);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
late_initcall(init_env);
|
|
||||||
|
|
||||||
#define CFG_RAMBOOT
|
#define CFG_RAMBOOT
|
||||||
|
|
||||||
#include "mt46v32m16-75.h"
|
#include "mt46v32m16-75.h"
|
||||||
|
|
|
@ -813,13 +813,13 @@ U_BOOT_CMD(
|
||||||
void
|
void
|
||||||
print_image_hdr (image_header_t *hdr)
|
print_image_hdr (image_header_t *hdr)
|
||||||
{
|
{
|
||||||
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
|
#ifdef CONFIG_CMD_DATE || defined(CONFIG_TIMESTAMP)
|
||||||
time_t timestamp = (time_t)ntohl(hdr->ih_time);
|
time_t timestamp = (time_t)ntohl(hdr->ih_time);
|
||||||
struct rtc_time tm;
|
struct rtc_time tm;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
printf (" Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
|
printf (" Image Name: %.*s\n", IH_NMLEN, hdr->ih_name);
|
||||||
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
|
#ifdef CONFIG_CMD_DATE || defined(CONFIG_TIMESTAMP)
|
||||||
to_tm (timestamp, &tm);
|
to_tm (timestamp, &tm);
|
||||||
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
|
printf (" Created: %4d-%02d-%02d %2d:%02d:%02d UTC\n",
|
||||||
tm.tm_year, tm.tm_mon, tm.tm_mday,
|
tm.tm_year, tm.tm_mon, tm.tm_mday,
|
||||||
|
|
|
@ -12,4 +12,3 @@ obj-y += serial.o
|
||||||
obj-y += speed.o
|
obj-y += speed.o
|
||||||
extra-y += start.o
|
extra-y += start.o
|
||||||
obj-y += traps.o
|
obj-y += traps.o
|
||||||
obj-y += usb_ohci.o
|
|
||||||
|
|
|
@ -41,6 +41,8 @@
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
|
#include <asm/arch/sdma.h>
|
||||||
|
#include <asm/bitops.h>
|
||||||
|
|
||||||
struct irq_action {
|
struct irq_action {
|
||||||
interrupt_handler_t *handler;
|
interrupt_handler_t *handler;
|
||||||
|
|
|
@ -54,9 +54,6 @@ Serial console configuration
|
||||||
#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */
|
#define CONFIG_BAUDRATE 115200 /* ... at 115200 bps */
|
||||||
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
|
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
|
||||||
|
|
||||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
|
||||||
#include <cmd_confdefs.h>
|
|
||||||
|
|
||||||
#define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */
|
#define CONFIG_TIMESTAMP 1 /* Print image info with timestamp */
|
||||||
|
|
||||||
#if (TEXT_BASE == 0xFF000000) /* Boot low */
|
#if (TEXT_BASE == 0xFF000000) /* Boot low */
|
||||||
|
@ -68,9 +65,6 @@ Serial console configuration
|
||||||
Autobooting
|
Autobooting
|
||||||
------------------------------------------------------------------------------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------------------------------------------------------------------------------*/
|
||||||
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
|
||||||
#define CONFIG_ZERO_BOOTDELAY_CHECK /* allow stopping of boot process even with bootdelay=0 */
|
|
||||||
#undef CONFIG_BOOTARGS
|
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_PREBOOT "echo;" \
|
#define CONFIG_PREBOOT "echo;" \
|
||||||
"echo Type \"run net_nfs\" to load Kernel over TFTP and to mount root filesystem over NFS;" \
|
"echo Type \"run net_nfs\" to load Kernel over TFTP and to mount root filesystem over NFS;" \
|
||||||
|
|
|
@ -158,5 +158,6 @@ typedef struct image_header {
|
||||||
|
|
||||||
/* common/cmd_bootm.c */
|
/* common/cmd_bootm.c */
|
||||||
void print_image_hdr (image_header_t *hdr);
|
void print_image_hdr (image_header_t *hdr);
|
||||||
|
extern image_header_t header;
|
||||||
|
|
||||||
#endif /* __IMAGE_H__ */
|
#endif /* __IMAGE_H__ */
|
||||||
|
|
Loading…
Reference in New Issue