diff -purN u-boot/common/cmd_bootm.c u-boot_chg/common/cmd_bootm.c --- u-boot/common/cmd_bootm.c 2007-02-21 11:00:26.000000000 +0530 +++ u-boot_chg/common/cmd_bootm.c 2007-02-27 17:14:10.000000000 +0530 @@ -461,21 +461,29 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag return 1; } + +#ifdef CONFIG_OF_FLAT_TREE U_BOOT_CMD( bootm, CFG_MAXARGS, 1, do_bootm, "bootm - boot application image from memory\n", "[addr [arg ...]]\n - boot application image stored in memory\n" "\tpassing arguments 'arg ...'; when booting a Linux kernel,\n" "\t'arg' can be the address of an initrd image\n" -#ifdef CONFIG_OF_FLAT_TREE "\tWhen booting a Linux kernel which requires a flat device-tree\n" "\ta third argument is required which is the address of the of the\n" "\tdevice-tree blob. To boot that kernel without an initrd image,\n" "\tuse a '-' for the second argument. If you do not pass a third\n" "\ta bd_info struct will be passed instead\n" -#endif ); - +#else +U_BOOT_CMD( + bootm, CFG_MAXARGS, 1, do_bootm, + "bootm - boot application image from memory\n", + "[addr [arg ...]]\n - boot application image stored in memory\n" + "\tpassing arguments 'arg ...'; when booting a Linux kernel,\n" + "\t'arg' can be the address of an initrd image\n" +); +#endif #ifdef CONFIG_SILENT_CONSOLE static void fixup_silent_linux () diff -purN u-boot/include/asm-i386/global_data.h u-boot_chg/include/asm-i386/global_data.h --- u-boot/include/asm-i386/global_data.h 2007-02-21 11:00:26.000000000 +0530 +++ u-boot_chg/include/asm-i386/global_data.h 2007-02-27 17:18:31.000000000 +0530 @@ -57,6 +57,13 @@ typedef struct { extern gd_t *global_data; -#define DECLARE_GLOBAL_DATA_PTR gd_t *gd = global_data +/*#define DECLARE_GLOBAL_DATA_PTR gd_t *gd = global_data :This is a error, +Global variables can only be initialized with constant expression*/ + +#ifdef _DEF_GLOBAL_PTR_ +#define DECLARE_GLOBAL_DATA_PTR gd_t *gd +#else +#define DECLARE_GLOBAL_DATA_PTR extern gd_t *gd +#endif #endif /* __ASM_GBL_DATA_H */ diff -purN u-boot/lib_i386/board.c u-boot_chg/lib_i386/board.c --- u-boot/lib_i386/board.c 2007-02-21 10:59:44.000000000 +0530 +++ u-boot_chg/lib_i386/board.c 2007-02-27 17:16:41.000000000 +0530 @@ -27,7 +27,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ - +#define _DEF_GLOBAL_PTR_ /*This macro is defined,so that + global data ptr "gd" is defined only once.*/ #include #include #include diff -purN u-boot/lib_i386/video_bios.c u-boot_chg/lib_i386/video_bios.c --- u-boot/lib_i386/video_bios.c 2007-02-21 10:59:44.000000000 +0530 +++ u-boot_chg/lib_i386/video_bios.c 2007-02-27 17:19:17.000000000 +0530 @@ -80,14 +80,27 @@ void print_bios_bios_stat(void) #define PCI_CLASS_VIDEO_STD 0 #define PCI_CLASS_VIDEO_PROG_IF_VGA 0 +/*Alert Fill the structure with appropraite vendor and device id*/ +#define PCI_VIDEO_VENDOR_ID 0 /*Use the appropraite vendor ID*/ +#define PCI_VIDEO_DEVICE_ID 0 /*Use the appropraite Device ID*/ + +static struct pci_device_id supported[] = { + {PCI_VIDEO_VENDOR_ID, PCI_VIDEO_DEVICE_ID}, + {} +}; static u32 probe_pci_video(void) { pci_dev_t devbusfn; - + int idx=0; +#if 0 /*pci_find_class is not defined in u-boot code*/ if ((devbusfn = pci_find_class(PCI_CLASS_VIDEO, PCI_CLASS_VIDEO_STD, - PCI_CLASS_VIDEO_PROG_IF_VGA, 0)) != -1) { + PCI_CLASS_VIDEO_PROG_IF_VGA, 0)) != -1) +#else + if ( (devbusfn = pci_find_devices(supported,idx) != -1)) +#endif + { u32 old; u32 addr;