From a2663ea4fc9d18cb8000c97ed92c3c668eda8e04 Mon Sep 17 00:00:00 2001 From: wdenk Date: Sun, 7 Dec 2003 18:32:37 +0000 Subject: =?UTF-8?q?*=20Patches=20by=20David=20M=FCller,=2014=20Nov=202003:?= =?UTF-8?q?=20=20=20-=20board/mpl/common/common=5Futil.c=20=20=20=20=20*?= =?UTF-8?q?=20implement=20support=20for=20BZIP2=20compressed=20images=20?= =?UTF-8?q?=20=20=20=20*=20various=20cleanups=20(printf=20->=20puts,=20...?= =?UTF-8?q?)=20=20=20-=20board/mpl/common/flash.c=20=20=20=20=20*=20report?= =?UTF-8?q?=20correct=20errors=20to=20upper=20layers=20=20=20=20=20*=20che?= =?UTF-8?q?ck=20the=20erase=20fail=20and=20VPP=20low=20bits=20in=20status?= =?UTF-8?q?=20reg=20=20=20-=20board/mpl/vcma9/cmd=5Fvcma9.c=20=20=20-=20bo?= =?UTF-8?q?ard/mpl/vcma9/flash.c=20=20=20=20=20*=20various=20cleanups=20(p?= =?UTF-8?q?rintf=20->=20puts,=20...)=20=20=20-=20common/cmd=5Fusb.c=20=20?= =?UTF-8?q?=20=20=20*=20fix=20typo=20in=20comment=20=20=20-=20cpu/arm920t/?= =?UTF-8?q?usb=5Fohci.c=20=20=20=20=20*=20support=20for=20S3C2410=20is=20m?= =?UTF-8?q?issing=20in=20#if=20line=20=20=20-=20drivers/cs8900.c=20=20=20?= =?UTF-8?q?=20=20*=20reinit=20some=20registers=20in=20case=20of=20error=20?= =?UTF-8?q?(cable=20missing,=20...)=20=20=20-=20fs/fat/fat.c=20=20=20=20?= =?UTF-8?q?=20*=20support=20for=20USB/MMC=20devices=20is=20missing=20in=20?= =?UTF-8?q?#if=20line=20=20=20-=20include/configs/MIP405.h=20=20=20-=20inc?= =?UTF-8?q?lude/configs/PIP405.h=20=20=20=20=20*=20enable=20BZIP2=20suppor?= =?UTF-8?q?t=20=20=20=20=20*=20enlarge=20malloc=20space=20to=201MiB=20beca?= =?UTF-8?q?use=20of=20BZIP2=20support=20=20=20-=20include/configs/VCMA9.h?= =?UTF-8?q?=20=20=20=20=20*=20enable=20BZIP2=20support=20=20=20=20=20*=20e?= =?UTF-8?q?nlarge=20malloc=20space=20to=201MiB=20because=20of=20BZIP2=20su?= =?UTF-8?q?pport=20=20=20=20=20*=20enable=20USB=20support=20=20=20-=20lib?= =?UTF-8?q?=5Farm/armlinux.c=20=20=20=20=20*=20change=20calling=20conventi?= =?UTF-8?q?on=20of=20ARM=20Linux=20kernel=20as=20=20=20=20=20=20=20describ?= =?UTF-8?q?ed=20on=20http://www.arm.linux.org.uk/developer/booting.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Patch by Thomas Lange, 14 Nov 2003: Split dbau1x00 into dbau1000, dbau1100 and dbau1500 configs to support all these AMD boards. * Patch by Thomas Lange, 14 Nov 2003: Workaround for mips au1x00 physical memory accesses (the au1x00 uses a 36 bit bus internally and cannot access physical memory directly. Use the uncached SDRAM address instead of the physical one.) --- include/asm-mips/addrspace.h | 12 ++++++++++++ include/configs/MIP405.h | 7 ++++++- include/configs/PIP405.h | 7 ++++++- include/configs/VCMA9.h | 30 ++++++++++++++++++++---------- include/configs/dbau1x00.h | 15 +++++++++++++-- 5 files changed, 57 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/asm-mips/addrspace.h b/include/asm-mips/addrspace.h index 0d1bf32..1fd00cc 100644 --- a/include/asm-mips/addrspace.h +++ b/include/asm-mips/addrspace.h @@ -40,6 +40,18 @@ #define PHYSADDR(a) ((a) & 0x1fffffff) #endif +/* + * Returns the uncached address of a sdram address + */ +#ifndef __ASSEMBLY__ +#ifdef CONFIG_AU1X00 +/* We use a 36 bit physical address map here and + cannot access physical memory directly from core */ +#define UNCACHED_SDRAM(a) (((unsigned long)(a)) | 0x20000000) +#else /* !CONFIG_AU1X00 */ +#define UNCACHED_SDRAM(a) PHYSADDR(a) +#endif /* CONFIG_AU1X00 */ +#endif /* __ASSEMBLY__ */ /* * Map an address to a certain kernel segment */ diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 61a799d..9c21745 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -218,7 +218,7 @@ #define CFG_FLASH_BASE 0xFFF80000 #define CFG_MONITOR_BASE CFG_FLASH_BASE #define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */ -#define CFG_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ +#define CFG_MALLOC_LEN (1024 * 1024) /* Reserve 1024 kB for malloc() */ /* * For booting Linux, the board info and command line data @@ -394,6 +394,11 @@ #endif /************************************************************ + * support BZIP2 compression + ************************************************************/ +#define CONFIG_BZIP2 1 + +/************************************************************ * Ident ************************************************************/ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index b9107cc..2cd5726 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -204,7 +204,7 @@ #define CFG_FLASH_BASE 0xFFF80000 #define CFG_MONITOR_BASE CFG_FLASH_BASE #define CFG_MONITOR_LEN (512 * 1024) /* Reserve 512 kB for Monitor */ -#define CFG_MALLOC_LEN (128 * 1024) /* Reserve 128 kB for malloc() */ +#define CFG_MALLOC_LEN (1024 * 1024) /* Reserve 1024 kB for malloc() */ /* * For booting Linux, the board info and command line data @@ -371,6 +371,11 @@ #endif /************************************************************ + * support BZIP2 compression + ************************************************************/ +#define CONFIG_BZIP2 1 + +/************************************************************ * Ident ************************************************************/ #define VERSION_TAG "released" diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 8a09da6..9ca80ab 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -42,6 +42,7 @@ #define CONFIG_ARM920T 1 /* This is an ARM920T Core */ #define CONFIG_S3C2410 1 /* in a SAMSUNG S3C2410 SoC */ #define CONFIG_VCMA9 1 /* on a MPL VCMA9 Board */ +#define LITTLEENDIAN 1 /* used by usb_ohci.c */ /* input clock of PLL */ #define CONFIG_SYS_CLK_FREQ 12000000/* VCMA9 has 12MHz input clock */ @@ -63,10 +64,13 @@ /*CFG_CMD_NAND |*/ \ CFG_CMD_EEPROM | \ CFG_CMD_I2C | \ - /*CFG_CMD_USB |*/ \ + CFG_CMD_USB | \ CFG_CMD_REGINFO | \ + CFG_CMD_FAT | \ CFG_CMD_DATE | \ CFG_CMD_ELF | \ + CFG_CMD_DHCP | \ + CFG_CMD_PING | \ CFG_CMD_BSP) /* this must be included after the definiton of CONFIG_COMMANDS */ @@ -96,11 +100,11 @@ /* * Size of malloc() pool */ -#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024) -#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ +/*#define CONFIG_MALLOC_SIZE (CFG_ENV_SIZE + 128*1024)*/ +#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ #define CFG_MONITOR_LEN (256 * 1024) -#define CFG_MALLOC_LEN (128 * 1024) +#define CFG_MALLOC_LEN (1024 * 1024) /* BUNZIP2 needs a lot of RAM */ /* * Hardware drivers @@ -119,14 +123,13 @@ /************************************************************ * USB support ************************************************************/ -#if 0 -#define CONFIG_USB_OHCI -#define CONFIG_USB_KEYBOARD -#define CONFIG_USB_STORAGE +#define CONFIG_USB_OHCI 1 +#define CONFIG_USB_KEYBOARD 1 +#define CONFIG_USB_STORAGE 1 +#define CONFIG_DOS_PARTITION 1 /* Enable needed helper functions */ #define CFG_DEVICE_DEREGISTER /* needs device_deregister */ -#endif /************************************************************ * RTC @@ -139,7 +142,11 @@ #define CONFIG_BAUDRATE 9600 -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 5 +/* autoboot (do NOT change this set environment variable "bootdelay" to -1 instead) */ +#define CONFIG_BOOT_RETRY_TIME -10 /* feature is avaiable but not enabled */ +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check console even if bootdelay = 0 */ + #define CONFIG_NETMASK 255.255.255.0 #define CONFIG_IPADDR 10.0.0.110 #define CONFIG_SERVERIP 10.0.0.1 @@ -176,6 +183,9 @@ /* valid baudrates */ #define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +/* support BZIP2 compression */ +#define CONFIG_BZIP2 1 + /************************************************************ * Ident ************************************************************/ diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 7aa90b7..6f647f2 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -32,9 +32,20 @@ #define CONFIG_DBAU1X00 1 #define CONFIG_AU1X00 1 /* alchemy series cpu */ +#ifdef CONFIG_DBAU1000 /* Also known as Merlot */ -#define CONFIG_DBAU1000 1 /* board, Hardcoded for now */ -#define CONFIG_AU1000 1 /* cpu, Hardcoded for now */ +#define CONFIG_AU1000 1 +#else +#ifdef CONFIG_DBAU1100 +#define CONFIG_AU1100 1 +#else +#ifdef CONFIG_DBAU1500 +#define CONFIG_AU1500 1 +#else +#error "No valid board set" +#endif +#endif +#endif #define CONFIG_ETHADDR DE:AD:BE:EF:01:01 /* Ethernet address */ -- cgit v1.1