diff options
author | Juergen Beisert <jbe@isonoe.(none)> | 2007-10-19 11:58:33 +0200 |
---|---|---|
committer | Juergen Beisert <jbe@isonoe.(none)> | 2007-10-19 11:58:33 +0200 |
commit | 6ad2703e6e7779fd1d2d7295443d04cecaef56e8 (patch) | |
tree | 5780f4707616c154c4e698050485bf9a8c1d7981 /arch | |
parent | c616179204072ba3dcf1e31aa2029fa6c2de3efe (diff) | |
parent | 95db50e812816127caf570449205a80cd626c263 (diff) | |
download | barebox-6ad2703e6e7779fd1d2d7295443d04cecaef56e8.tar.gz barebox-6ad2703e6e7779fd1d2d7295443d04cecaef56e8.tar.xz |
Merge branch 'master' of jbe@octopus:/home/git/projects/u-boot-v2
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/scb9328_defconfig | 140 | ||||
-rw-r--r-- | arch/ppc/mach-mpc5xxx/start.S | 4 |
2 files changed, 99 insertions, 45 deletions
diff --git a/arch/arm/configs/scb9328_defconfig b/arch/arm/configs/scb9328_defconfig index b76816ed30..ce329d3126 100644 --- a/arch/arm/configs/scb9328_defconfig +++ b/arch/arm/configs/scb9328_defconfig @@ -1,62 +1,122 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.20-rc5 -# Tue Jun 26 00:41:32 2007 +# U-Boot version: 2.0.0-git +# Fri Oct 19 11:00:09 2007 # -CONFIG_TEXT_BASE=0x08f80000 +CONFIG_ARCH_TEXT_BASE=0x08f80000 +CONFIG_BOARDINFO="Synertronixx scb9328" +# CONFIG_BOARD_LINKER_SCRIPT is not set +CONFIG_GENERIC_LINKER_SCRIPT=y CONFIG_ARM=y CONFIG_ARM920T=y CONFIG_ARCH_IMX=y +CONFIG_ARCH_IMX1=y # CONFIG_MACH_MX1ADS is not set CONFIG_MACH_SCB9328=y +# CONFIG_MACH_PCM038 is not set # CONFIG_MACH_ECO920 is not set +# CONFIG_MACH_NXDB500 is not set +# CONFIG_MACH_IMX31 is not set + +# +# Arm specific settings +# +CONFIG_CMDLINE_TAG=y +CONFIG_SETUP_MEMORY_TAGS=y +# CONFIG_INITRD_TAG is not set +CONFIG_GREGORIAN_CALENDER=y +CONFIG_HAS_KALLSYMS=y +CONFIG_HAS_MODULES=y # -# general settings +# General Settings # +CONFIG_TEXT_BASE=0x08f80000 +# CONFIG_BROKEN is not set +# CONFIG_EXPERIMENTAL is not set CONFIG_PROMPT="uboot:" CONFIG_BAUDRATE=115200 CONFIG_CMDLINE_EDITING=y # CONFIG_AUTO_COMPLETE is not set -# CONFIG_LONGHELP is not set +CONFIG_LONGHELP=y CONFIG_CBSIZE=1024 CONFIG_MAXARGS=16 -CONFIG_HUSH_PARSER=y +CONFIG_SHELL_HUSH=y +# CONFIG_SHELL_SIMPLE is not set CONFIG_PROMPT_HUSH_PS2="> " -CONFIG_ZERO_BOOTDELAY_CHECK=y CONFIG_DYNAMIC_CRC_TABLE=y CONFIG_ERRNO_MESSAGES=y +CONFIG_TIMESTAMP=y +CONFIG_CONSOLE_ACTIVATE_FIRST=y +# CONFIG_OF_FLAT_TREE is not set +CONFIG_DEFAULT_ENVIRONMENT=y +CONFIG_DEFAULT_ENVIRONMENT_PATH="board/scb9328/env" # -# Commands +# Debugging +# +CONFIG_SKIP_LOWLEVEL_INIT=y +# CONFIG_ENABLE_FLASH_NOISE is not set +# CONFIG_ENABLE_PARTITION_NOISE is not set +# CONFIG_ENABLE_DEVICE_NOISE is not set + +# +# Commands +# + +# +# scripting # -CONFIG_CMD_ECHO=y CONFIG_CMD_EDIT=y -CONFIG_CMD_EXEC=y +CONFIG_CMD_SLEEP=y CONFIG_CMD_ENVIRONMENT=y -CONFIG_CMD_CLEAR=y -# CONFIG_CMD_CONSOLE is not set -CONFIG_CMD_ENV=y CONFIG_CMD_HELP=y -# CONFIG_CMD_MII is not set + +# +# file commands +# +CONFIG_CMD_LS=y +CONFIG_CMD_RM=y +CONFIG_CMD_CAT=y +CONFIG_CMD_MKDIR=y +CONFIG_CMD_RMDIR=y +CONFIG_CMD_CP=y +CONFIG_CMD_PWD=y +CONFIG_CMD_CD=y +CONFIG_CMD_MOUNT=y +CONFIG_CMD_UMOUNT=y + +# +# console +# +CONFIG_CMD_CLEAR=y +CONFIG_CMD_ECHO=y + +# +# memory +# +CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMORY=y +# CONFIG_CMD_CRC is not set # CONFIG_CMD_MTEST is not set -# CONFIG_CMD_I2C is not set -# CONFIG_CMD_AUTOSCRIPT is not set + +# +# flash +# CONFIG_CMD_FLASH=y -# CONFIG_CMD_LOADB is not set -# CONFIG_CMD_LOADS is not set -CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_SPLASH is not set -CONFIG_CMD_SLEEP=y -CONFIG_CMD_BOOTM=y -# CONFIG_CMD_BOOTM_ZLIB is not set -# CONFIG_CMD_BOOTM_BZLIB is not set # -# Debugging +# booting # -CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_CMD_BOOTM=y +# CONFIG_CMD_BOOTM_ZLIB is not set +# CONFIG_CMD_BOOTM_BZLIB is not set +# CONFIG_CMD_BOOTM_SHOW_TYPE is not set +CONFIG_CMD_RESET=y +CONFIG_CMD_GO=y +CONFIG_CMD_TIMEOUT=y +CONFIG_CMD_PARTITION=y +CONFIG_CMD_TEST=y CONFIG_NET=y CONFIG_NET_BOOTP=y CONFIG_NET_DHCP=y @@ -67,35 +127,33 @@ CONFIG_NET_PING=y CONFIG_NET_TFTP=y # -# drivers +# Drivers # # -# serial drivers +# serial drivers # -# CONFIG_DRIVER_SERIAL_DUMMY is not set +CONFIG_DRIVER_SERIAL_IMX=y CONFIG_HAS_DM9000=y +CONFIG_MIIPHY=y # -# Network drivers +# Network drivers # +# CONFIG_DRIVER_NET_SMC911X is not set CONFIG_DRIVER_NET_DM9000=y # -# video drivers -# -# CONFIG_DRIVER_VIDEO_S1D13706 is not set - -# -# I2C drivers -# - -# -# USB host support +# flash drivers # CONFIG_HAS_CFI=y CONFIG_DRIVER_CFI=y # CONFIG_DRIVER_CFI_NEW is not set CONFIG_CFI_BUFFER_WRITE=y -CONFIG_FS=y +# CONFIG_NAND is not set + +# +# Filesystem support +# # CONFIG_FS_CRAMFS is not set +CONFIG_CRC32=y diff --git a/arch/ppc/mach-mpc5xxx/start.S b/arch/ppc/mach-mpc5xxx/start.S index eda85983ed..0c87e6b3d1 100644 --- a/arch/ppc/mach-mpc5xxx/start.S +++ b/arch/ppc/mach-mpc5xxx/start.S @@ -33,10 +33,6 @@ #include <asm/cache.h> #include <asm/mmu.h> -#ifndef CONFIG_IDENT_STRING -#define CONFIG_IDENT_STRING "" -#endif - /* We don't want the MMU yet. */ #undef MSR_KERNEL |