summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README8
-rw-r--r--doc/README.JFFS210
-rw-r--r--include/configs/astro_mcf5373l.h11
-rw-r--r--include/configs/at91sam9263ek.h1
-rw-r--r--include/configs/socrates.h3
-rw-r--r--include/configs/stmark2.h4
-rw-r--r--include/configs/tuxx1.h4
7 files changed, 0 insertions, 41 deletions
diff --git a/README b/README
index 737492893a0..39243dfe355 100644
--- a/README
+++ b/README
@@ -762,11 +762,6 @@ The following options need to be configured:
entering dfuMANIFEST state. Host waits this timeout, before
sending again an USB request to the device.
-- Journaling Flash filesystem support:
- CONFIG_SYS_JFFS2_FIRST_SECTOR,
- CONFIG_SYS_JFFS2_FIRST_BANK, CONFIG_SYS_JFFS2_NUM_BANKS
- Define these for a default partition on a NOR device
-
- Keyboard Support:
See Kconfig help for available keyboard drivers.
@@ -1740,9 +1735,6 @@ Low Level (hardware related) configuration options:
- CONFIG_SYS_OR_TIMING_SDRAM:
SDRAM timing
-- CONFIG_SYS_MAMR_PTA:
- periodic timer for refresh
-
- CONFIG_SYS_SRIO:
Chip has SRIO or not
diff --git a/doc/README.JFFS2 b/doc/README.JFFS2
index 0245da0488f..fddefb17469 100644
--- a/doc/README.JFFS2
+++ b/doc/README.JFFS2
@@ -21,16 +21,6 @@ Sorting is done while inserting into the fragment list, which is
more or less a bubble sort. That algorithm is known to be O(n^2),
thus you should really consider if you can avoid it!
-
-There only one way for JFFS2 to find the disk. It uses the flash_info
-structure to find the start of a JFFS2 disk (called partition in the code)
-and you can change where the partition is with two defines.
-
-CONFIG_SYS_JFFS2_FIRST_BANK
- defined the first flash bank to use
-
-CONFIG_SYS_JFFS2_FIRST_SECTOR
- defines the first sector to use
---
TODO.
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index adfadd7c6d7..c79f9ca8f0f 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -46,9 +46,6 @@
*/
#ifdef CONFIG_RAM
#define CONFIG_MONITOR_IS_IN_RAM
-#define ENABLE_JFFS 0
-#else
-#define ENABLE_JFFS 1
#endif
/* I2C */
@@ -210,14 +207,6 @@
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*)
-#if ENABLE_JFFS
-/* JFFS Partition offset set */
-#define CONFIG_SYS_JFFS2_FIRST_BANK 0
-#define CONFIG_SYS_JFFS2_NUM_BANKS 1
-/* 512k reserved for u-boot */
-#define CONFIG_SYS_JFFS2_FIRST_SECTOR 0x40
-#endif
-
/* Cache Configuration */
#define ICACHE_STATUS (CONFIG_SYS_INIT_RAM_ADDR + \
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 02d04d0776b..fb65880f32e 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -34,7 +34,6 @@
#define PHYS_FLASH_1 0x10000000
#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1
-#define CONFIG_SYS_MONITOR_SEC 1:0-3
#define CONFIG_SYS_MONITOR_LEN (256 << 10)
/* Address and size of Primary Environment Sector */
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index fc00931e0ae..c75991badab 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -78,8 +78,6 @@
/*
* Flash on the LocalBus
*/
-#define CONFIG_SYS_LBC_CACHE_BASE 0xf0000000 /* Localbus cacheable */
-
#define CONFIG_SYS_FLASH0 0xFE000000
#define CONFIG_SYS_FLASH1 0xFC000000
#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH1, CONFIG_SYS_FLASH0 }
@@ -108,7 +106,6 @@
/* LIME GDC */
#define CONFIG_SYS_LIME_BASE 0xc8000000
-#define CONFIG_SYS_LIME_SIZE 0x04000000 /* 64 MB */
/*
* General PCI
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index d8a334868f3..8167d250f27 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -34,10 +34,6 @@
"sf write ${loadaddr} 0x00800000 ${filesize}\0" \
""
-/* Realtime clock */
-#define CONFIG_RTC_MCFRRTC
-#define CONFIG_SYS_MCFRRTC_BASE 0xFC0A8000
-
#define CONFIG_SYS_SBFHDR_SIZE 0x7
/* Input, PCI, Flexbus, and VCO */
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index f5a9f1284a3..7eed31c35f0 100644
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -31,8 +31,4 @@
#include "km/km-mpc83xx.h"
#include "km/km-mpc832x.h"
-#define CONFIG_SYS_MAMR (MxMR_GPL_x4DIS | \
- 0x0000c000 | \
- MxMR_WLFx_2X)
-
#endif /* __CONFIG_H */