Browse Source

buildroot; move defconfigs to configs/ and print in help

As discussed earlier on the mailing list. It simplifies code, gives more
sensible error message on typos and makes the defconfigs easier to find
for users.

Furthermore, update documentation to match.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 16 years ago
parent
commit
58fd779a43

+ 6 - 3
Makefile

@@ -591,9 +591,9 @@ endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 flush:
 	rm -f $(BUILD_DIR)/tgt-config.cache
 
-%_defconfig: $(CONFIG)/conf
-	cp $(shell find ./target/ -name $@) .config
-	-@$(MAKE) oldconfig
+%_defconfig: $(TOPDIR)/configs/%_defconfig
+	cp $^ .config
+	@$(MAKE) oldconfig
 
 configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
 
@@ -628,6 +628,9 @@ help:
 	@echo '  external-deps          - list external packages used'
 	@echo '  flush                  - flush configuration cache'
 	@echo
+	@$(foreach b, $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig)), \
+	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)
+	@echo
 	@echo 'See docs/README and docs/buildroot.html for further details'
 	@echo
 

+ 0 - 0
target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig → configs/arm_toolchain_defconfig


+ 0 - 0
target/device/Atmel/at91rm9200df/at91rm9200df_defconfig → configs/at91rm9200df_defconfig


+ 0 - 0
target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig → configs/at91rm9200df_ext_bare_defconfig


+ 0 - 0
target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig → configs/at91rm9200df_ext_defconfig


+ 0 - 0
target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig → configs/at91sam9260dfc_defconfig


+ 0 - 0
target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig → configs/at91sam9260dfc_ext_bare_defconfig


+ 0 - 0
target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig → configs/at91sam9260dfc_ext_defconfig


+ 0 - 0
target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig → configs/at91sam9260pf_defconfig


+ 0 - 0
target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig → configs/at91sam9261ek_defconfig


+ 0 - 0
target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig → configs/at91sam9261ek_ext_bare_defconfig


+ 0 - 0
target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig → configs/at91sam9261ek_ext_defconfig


+ 0 - 0
target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig → configs/at91sam9263ek_defconfig


+ 0 - 0
target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig → configs/at91sam9263ek_ext_bare_defconfig


+ 0 - 0
target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig → configs/at91sam9263ek_ext_defconfig


+ 0 - 0
target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig → configs/at91sam9g20dfc_defconfig


+ 0 - 0
target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig → configs/at91sam9g20dfc_ext_bare_defconfig


+ 0 - 0
target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig → configs/at91sam9g20dfc_ext_defconfig


+ 0 - 0
target/device/Atmel/atngw100-base/atngw100-base_defconfig → configs/atngw100-base_defconfig


+ 0 - 0
target/device/Atmel/atngw100/atngw100_defconfig → configs/atngw100_defconfig


+ 0 - 0
target/device/Atmel/atstk1005/atstk1005_defconfig → configs/atstk1005_defconfig


+ 0 - 0
target/device/Atmel/atstk100x/atstk100x_defconfig → configs/atstk100x_defconfig


+ 0 - 0
target/device/x86/i686/i386_defconfig → configs/i386_defconfig


+ 0 - 0
target/device/x86/i686/i686_defconfig → configs/i686_defconfig


+ 0 - 0
target/device/ARMLTD/integrator926/integrator926_defconfig → configs/integrator926_defconfig


+ 0 - 0
target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig → configs/integrator926_huge_defconfig


+ 0 - 0
target/device/KwikByte/kb9202/kb9202_defconfig → configs/kb9202_defconfig


+ 0 - 0
target/device/valka/v100sc2_defconfig → configs/v100sc2_defconfig


+ 9 - 16
docs/buildroot.html

@@ -646,22 +646,15 @@ endif
 
       <li>Then, in the
       <code>target/device/yourcompany/project-foobar/</code>
-      directory, you can store different files:
-
-      <ul>
-
-	<li>One or more Buildroot configurations, under file named
-	<code>something_defconfig</code>. Your users will then be able
-	to run <code>make something_defconfig</code> and get the right
-	configuration for your project</li>
-
-	<li>Configuration files for the kernel, for Busybox or
-	uClibc. These files can then be referenced by the Buildroot
-	configuration described above</li>
-
-      </ul>
-
-      </li>
+      directory, you can store configuration files for the kernel,
+      for Busybox or uClibc.
+
+      You can furthermore create one or more preconfigured configuration
+      files, referencing those files. These config files are named
+      <code>something_defconfig</config> and are stored in the toplevel
+      <code>configs/</code> directory. Your users will then be able
+      to run <code>make something_defconfig</code> and get the right
+      configuration for your project</li>
 
     </ol>