summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h b/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
index 9ef4b9368f..9d4edcec88 100644
--- a/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
+++ b/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
@@ -39,7 +39,6 @@
# define CONFIG_CHIP_FEATURE_SYNOP3504 1
# define CONFIG_CHIP_FEATURE_SYNOP3504_NO_GIGABIT 1
# define CONFIG_CHIP_FEATURE_SYNOP3504_PHY_DINI 1
-# define CONFIG_CHIP_FEATURE_LINUX_MEM_WORKAROUND 1
# define CONFIG_CHIP_FEATURE_DINI_UART_SELECT 1
# define CONFIG_CHIP_FEATURE_FIXED_MASTER_CLOCK 1
# define CONFIG_CHIP_MAX_MASTER_CLOCK 47000000
@@ -49,7 +48,6 @@
# define CONFIG_CHIP_FEATURE_INT_MAP_V2 1
# define CONFIG_CHIP_FEATURE_MIU_CTRL 1
# define CONFIG_CHIP_FEATURE_SYNOP3504 1
-# define CONFIG_CHIP_FEATURE_LINUX_MEM_WORKAROUND 1
# define CONFIG_CHIP_FEATURE_FIXED_ARM_CLOCK 1
# define CONFIG_CHIP_MAX_MASTER_CLOCK 246000000
# define CONFIG_CHIP_FEATURE_MSEPLL 1
@@ -135,12 +133,7 @@
#define CONFIG_ZERO_BOOTDELAY_CHECK 1
/* Boot parameters given to Linux */
-#ifdef CONFIG_CHIP_FEATURE_LINUX_MEM_WORKAROUND
-/* Workaround for #2842. */
-# define CONFIG_BOOTARGS "console=ttyS0,115200 panic=1 oops=panic mem=28M"
-#else
-# define CONFIG_BOOTARGS "console=ttyS0,115200 panic=1 oops=panic"
-#endif
+#define CONFIG_BOOTARGS "console=ttyS0,115200 panic=1 oops=panic"
/* Allow the following commands */
#define CONFIG_COMMANDS \