diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/AmigaOneG3SE.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8610HPCD.h | 2 | ||||
| -rw-r--r-- | include/configs/NX823.h | 2 | ||||
| -rw-r--r-- | include/configs/lwmon5.h | 3 | ||||
| -rw-r--r-- | include/configs/sbc8641d.h | 10 | ||||
| -rw-r--r-- | include/configs/sequoia.h | 26 | ||||
| -rw-r--r-- | include/configs/zeus.h | 2 |
7 files changed, 33 insertions, 14 deletions
diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h index d914dccfbb..a992498dc0 100644 --- a/include/configs/AmigaOneG3SE.h +++ b/include/configs/AmigaOneG3SE.h @@ -54,7 +54,7 @@ #undef CONFIG_CLOCKS_IN_MHZ /* clocks passed to Linux in Hz */ -#define CONFIG_BOOTARGS "root=/dev/ram rw ramdisk=4096" +#define CONFIG_BOOTARGS "root=/dev/ram rw ramdisk_size=4096" /* * BOOTP options diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 39201474e9..9e70198e42 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -24,7 +24,7 @@ #define CONFIG_FSL_DIU_FB 1 /* FSL DIU */ /* video */ -#define CONFIG_VIDEO +#undef CONFIG_VIDEO #if defined(CONFIG_VIDEO) #define CONFIG_CFB_CONSOLE diff --git a/include/configs/NX823.h b/include/configs/NX823.h index 524aa0621b..da1c173a43 100644 --- a/include/configs/NX823.h +++ b/include/configs/NX823.h @@ -47,7 +47,7 @@ #undef CONFIG_8xx_CONS_NONE #define CONFIG_BAUDRATE 57600 /* console baudrate = 115kbps */ #define CONFIG_BOOTDELAY 2 /* autoboot after 2 seconds */ -#define CONFIG_BOOTARGS "ramdisk=8000 "\ +#define CONFIG_BOOTARGS "ramdisk_size=8000 "\ "root=/dev/nfs rw nfsroot=10.77.77.250:/ppcroot "\ "nfsaddrs=10.77.77.20:10.77.77.250" #define CONFIG_BOOTCOMMAND "bootm 400e0000" diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index d8a2267b9a..97e8bf1c50 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -366,12 +366,11 @@ #define CFG_PCI_SUBSYS_VENDORID 0x10e8 /* AMCC */ #define CFG_PCI_SUBSYS_ID 0xcafe /* Whatever */ -#if 0 /* * ToDo: Watchdog is not test fully, so exclude it for now */ #define CONFIG_HW_WATCHDOG 1 /* Use external HW-Watchdog */ -#endif +#define CONFIG_WD_PERIOD 40000 /* in usec */ /* * For booting Linux, the board info and command line data diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 1991a8cc87..18cedff929 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -268,13 +268,9 @@ /* * Pass open firmware flat tree to kernel */ -#define CONFIG_OF_FLAT_TREE 1 -#define CONFIG_OF_BOARD_SETUP 1 - -#define OF_CPU "PowerPC,8641@0" -#define OF_SOC "soc@f8000000" -#define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc@f8000000/serial@4500" +#define CONFIG_OF_LIBFDT 1 +#define CONFIG_OF_BOARD_SETUP 1 +#define CONFIG_OF_STDOUT_VIA_ALIAS 1 #define CFG_64BIT_VSPRINTF 1 #define CFG_64BIT_STRTOUL 1 diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index cd0ae6d1a8..52952a9da0 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -43,7 +43,13 @@ #define CONFIG_SYS_CLK_FREQ ((in8(CFG_BCSR_BASE + 3) & 0x80) ? \ 33333333 : 33000000) -#if 0 +/* + * Define this if you want support for video console with radeon 9200 pci card + * Also set TEXT_BASE to 0xFFF80000 in board/amcc/sequoia/config.mk in this case + */ +#undef CONFIG_VIDEO + +#ifdef CONFIG_VIDEO /* * 44x dcache supported is working now on sequoia, but we don't enable * it yet since it needs further testing @@ -58,8 +64,13 @@ * Base addresses -- Note these are effective addresses where the actual * resources get mapped (not physical addresses). */ +#ifndef CONFIG_VIDEO #define CFG_MONITOR_LEN (384 * 1024) /* Reserve 384 kiB for Monitor */ #define CFG_MALLOC_LEN (256 * 1024) /* Reserve 256 kiB for malloc() */ +#else +#define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */ +#define CFG_MALLOC_LEN (1024 * 1024) /* Reserve 1024 kB for malloc() */ +#endif #define CFG_TLB_FOR_BOOT_FLASH 0x0003 #define CFG_BOOT_BASE_ADDR 0xf0000000 @@ -571,4 +582,17 @@ #define CONFIG_OF_LIBFDT 1 #define CONFIG_OF_BOARD_SETUP 1 +#ifdef CONFIG_VIDEO +#define CONFIG_BIOSEMU /* x86 bios emulator for vga bios */ +#define CONFIG_ATI_RADEON_FB /* use radeon framebuffer driver */ +#define VIDEO_IO_OFFSET 0xe8000000 +#define CFG_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_VIDEO_LOGO +#define CONFIG_CFB_CONSOLE +#define CONFIG_SPLASH_SCREEN +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_CMD_BMP +#endif + #endif /* __CONFIG_H */ diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 810a528d24..cd120dfbf1 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -333,7 +333,7 @@ "nfsargs=setenv bootargs root=/dev/nfs rw" \ " nfsroot=${serverip}:${rootpath}\0" \ "ramargs=setenv bootargs root=/dev/ram rw" \ - " ramdisk=${ramdisk_size}\0" \ + " ramdisk_size=${ramdisk_size}\0" \ "addip=setenv bootargs ${bootargs} " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ ":${hostname}:${netdev}:off panic=1\0" \ |
