aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorAdrian Chadd <adrian@FreeBSD.org>2011-11-24 07:32:52 +0000
committerAdrian Chadd <adrian@FreeBSD.org>2011-11-24 07:32:52 +0000
commit1c3ed0a410cf059269ddbece265a7f91052c1556 (patch)
tree5e3d5d766b2144d5328bf068e8a11021fc7cba58 /sys/conf
parentfee9ff323f1aa604f2ed197fb160de9ad0aabb31 (diff)
downloadsrc-1c3ed0a410cf059269ddbece265a7f91052c1556.tar.gz
src-1c3ed0a410cf059269ddbece265a7f91052c1556.zip
Introduce a new (global, sorry!) option which controls whether
the ar71xx platform code should assume a uboot or redboot environment. The current code gets very confused (and just crashes) on a uboot environment, where each attribute=value pair is in a single entry. Redboot on the other hand stores it as "attribute", "value", "attribute", "value", ... This allows the kernel to boot on a TP-LINK TL-WR1043ND from flash, where the uboot environment gets setup. This didn't show up during a netboot as "tftpboot" and "go" don't setup the uboot environment variables.
Notes
Notes: svn path=/head/; revision=227924
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/options3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 12e676e538e8..12dbc81bdacd 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -899,4 +899,5 @@ RCTL opt_global.h
# that "lies" about the amount of RAM it has. Until a cleaner method is
# defined, this option will suffice in overriding what Redboot says.
AR71XX_REALMEM opt_global.h
-
+AR71XX_ENV_UBOOT opt_global.h
+AR71XX_ENV_REDBOOT opt_global.h