summaryrefslogtreecommitdiff
path: root/src/mainboard/digitallogic
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2009-10-03 16:24:58 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2009-10-03 16:24:58 +0000
commit6768f39a4b5a5d6d1c2318f632f801fe1c8084cd (patch)
tree70ed41597c9cd4d19bec099a8ba403d48cdf4208 /src/mainboard/digitallogic
parent8f3ec7b1a3771a317c2415e2366fa719582f29d1 (diff)
Remove:
- CONFIG_CBFS - anything that's conditional on CONFIG_CBFS == 0 - files that were only included for CONFIG_CBFS == 0 In particular: - elfboot - stream boot code - mini-filo and filesystems (depends on stream boot code) After this commit, there is no way to build an image that is not using CBFS anymore. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Myles Watson <mylesgw@gmail.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4712 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/digitallogic')
-rw-r--r--src/mainboard/digitallogic/adl855pc/Options.lb8
-rw-r--r--src/mainboard/digitallogic/msm586seg/Options.lb8
-rw-r--r--src/mainboard/digitallogic/msm586seg/mainboard.c12
-rw-r--r--src/mainboard/digitallogic/msm800sev/Options.lb7
4 files changed, 0 insertions, 35 deletions
diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index 0ece7ebef7..7fc51bcafc 100644
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/src/mainboard/digitallogic/adl855pc/Options.lb
@@ -1,5 +1,4 @@
uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_CBFS
uses CONFIG_HAVE_PIRQ_TABLE
uses CONFIG_USE_FALLBACK_IMAGE
uses CONFIG_HAVE_FALLBACK_BOOT
@@ -113,11 +112,4 @@ default CONFIG_ROM_PAYLOAD = 1
default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
default HOSTCC="gcc"
-
-
-#
-# CBFS
-#
-#
-default CONFIG_CBFS=1
end
diff --git a/src/mainboard/digitallogic/msm586seg/Options.lb b/src/mainboard/digitallogic/msm586seg/Options.lb
index 5f85c3a917..fe1ed83e94 100644
--- a/src/mainboard/digitallogic/msm586seg/Options.lb
+++ b/src/mainboard/digitallogic/msm586seg/Options.lb
@@ -1,5 +1,4 @@
uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_CBFS
uses CONFIG_HAVE_PIRQ_TABLE
uses CONFIG_USE_FALLBACK_IMAGE
uses CONFIG_HAVE_FALLBACK_BOOT
@@ -121,11 +120,4 @@ default CONFIG_ROM_PAYLOAD = 1
default CC="$(CONFIG_CROSS_COMPILE)gcc -m32"
default HOSTCC="gcc"
-
-
-#
-# CBFS
-#
-#
-default CONFIG_CBFS=1
end
diff --git a/src/mainboard/digitallogic/msm586seg/mainboard.c b/src/mainboard/digitallogic/msm586seg/mainboard.c
index 7bd8ac0910..d9d3b14dff 100644
--- a/src/mainboard/digitallogic/msm586seg/mainboard.c
+++ b/src/mainboard/digitallogic/msm586seg/mainboard.c
@@ -35,9 +35,6 @@ static void irqdump()
- set ADDDECTL (now done in raminit.c in cpu/amd/sc520
*/
static void enable_dev(struct device *dev) {
-#if !CONFIG_CBFS
- extern unsigned char *rom_start, *rom_end;
-#endif
volatile struct mmcrpic *pic = MMCRPIC;
volatile struct mmcr *mmcr = MMCRDEFAULT;
@@ -135,15 +132,6 @@ static void enable_dev(struct device *dev) {
*/
/* follow fuctory here */
mmcr->dmacontrol.extchanmapa = 0x3210;
-
-#if !CONFIG_CBFS
- /* hack for IDIOTIC need to fix rom_start */
- printk_err("Patching rom_start due to sc520 limits\n");
- rom_start = 0x2000000 + 0x40000;
- rom_end = rom_start + CONFIG_PAYLOAD_SIZE - 1;
-#endif
-
-
}
struct chip_operations mainboard_ops = {
CHIP_NAME("DIGITAL-LOGIC MSM586SEG Mainboard")
diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb
index 3d9f0c706a..35f60c65af 100644
--- a/src/mainboard/digitallogic/msm800sev/Options.lb
+++ b/src/mainboard/digitallogic/msm800sev/Options.lb
@@ -1,5 +1,4 @@
uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_CBFS
uses CONFIG_HAVE_PIRQ_TABLE
uses CONFIG_USE_FALLBACK_IMAGE
uses CONFIG_HAVE_FALLBACK_BOOT
@@ -180,10 +179,4 @@ default CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
## At a maximum only compile in this level of debugging
default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8
-
-#
-# CBFS
-#
-#
-default CONFIG_CBFS=1
end