qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 22:05:20 +02:00
Code

fix a small bug in the config merge/split (fixes buildbot error on ixp4xx)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6427 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-02-28 13:00:26 +00:00
parent 89be048fff
commit f3940a6675
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/config.pl
View File

@ -23,7 +23,7 @@ sub load_config($) {
next;
};
/^# CONFIG_(.+?) is not set/ and do {
$config{$1} = -1;
$config{$1} = "#undef";
next;
};
/^#/ and next;
@ -91,7 +91,7 @@ sub config_sub($$) {
sub print_cfgline($$) {
my $name = shift;
my $val = shift;
if ($val eq '-1') {
if ($val eq '#undef') {
print "# CONFIG_$name is not set\n";
} else {
print "CONFIG_$name=$val\n";

3
target/linux/ixp4xx-2.6/config/default
View File

@ -265,7 +265,7 @@ CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_PLATRAM is not set
# CONFIG_MTD_PMC551 is not set
# CONFIG_MTD_RAM is not set
# CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK is not set
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
CONFIG_MTD_REDBOOT_PARTS=y
CONFIG_MTD_REDBOOT_PARTS_READONLY=y
CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@ -331,7 +331,6 @@ CONFIG_PATA_ARTOP=m
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
# CONFIG_PC300 is not set
# CONFIG_PCMCIA is not set
# CONFIG_PCCARD is not set
# CONFIG_PCI200SYN is not set
# CONFIG_PCIPCWATCHDOG is not set