From 58fd779a4355e5bfa2bc0b15ed9c4664f44c7a0f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 4 Oct 2009 22:09:25 +0200 Subject: [PATCH] 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 --- Makefile | 9 ++++--- .../arm_toolchain_defconfig | 0 .../at91rm9200df_defconfig | 0 .../at91rm9200df_ext_bare_defconfig | 0 .../at91rm9200df_ext_defconfig | 0 .../at91sam9260dfc_defconfig | 0 .../at91sam9260dfc_ext_bare_defconfig | 0 .../at91sam9260dfc_ext_defconfig | 0 .../at91sam9260pf_defconfig | 0 .../at91sam9261ek_defconfig | 0 .../at91sam9261ek_ext_bare_defconfig | 0 .../at91sam9261ek_ext_defconfig | 0 .../at91sam9263ek_defconfig | 0 .../at91sam9263ek_ext_bare_defconfig | 0 .../at91sam9263ek_ext_defconfig | 0 .../at91sam9g20dfc_defconfig | 0 .../at91sam9g20dfc_ext_bare_defconfig | 0 .../at91sam9g20dfc_ext_defconfig | 0 .../atngw100-base_defconfig | 0 .../atngw100 => configs}/atngw100_defconfig | 0 .../atstk1005 => configs}/atstk1005_defconfig | 0 .../atstk100x => configs}/atstk100x_defconfig | 0 .../x86/i686 => configs}/i386_defconfig | 0 .../x86/i686 => configs}/i686_defconfig | 0 .../integrator926_defconfig | 0 .../integrator926_huge_defconfig | 0 .../kb9202 => configs}/kb9202_defconfig | 0 .../valka => configs}/v100sc2_defconfig | 0 docs/buildroot.html | 25 +++++++------------ 29 files changed, 15 insertions(+), 19 deletions(-) rename {target/device/Atmel/at91sam9260dfc => configs}/arm_toolchain_defconfig (100%) rename {target/device/Atmel/at91rm9200df => configs}/at91rm9200df_defconfig (100%) rename {target/device/Atmel/at91rm9200df => configs}/at91rm9200df_ext_bare_defconfig (100%) rename {target/device/Atmel/at91rm9200df => configs}/at91rm9200df_ext_defconfig (100%) rename {target/device/Atmel/at91sam9260dfc => configs}/at91sam9260dfc_defconfig (100%) rename {target/device/Atmel/at91sam9260dfc => configs}/at91sam9260dfc_ext_bare_defconfig (100%) rename {target/device/Atmel/at91sam9260dfc => configs}/at91sam9260dfc_ext_defconfig (100%) rename {target/device/Atmel/at91sam9260pf => configs}/at91sam9260pf_defconfig (100%) rename {target/device/Atmel/at91sam9261ek => configs}/at91sam9261ek_defconfig (100%) rename {target/device/Atmel/at91sam9261ek => configs}/at91sam9261ek_ext_bare_defconfig (100%) rename {target/device/Atmel/at91sam9261ek => configs}/at91sam9261ek_ext_defconfig (100%) rename {target/device/Atmel/at91sam9263ek => configs}/at91sam9263ek_defconfig (100%) rename {target/device/Atmel/at91sam9263ek => configs}/at91sam9263ek_ext_bare_defconfig (100%) rename {target/device/Atmel/at91sam9263ek => configs}/at91sam9263ek_ext_defconfig (100%) rename {target/device/Atmel/at91sam9g20dfc => configs}/at91sam9g20dfc_defconfig (100%) rename {target/device/Atmel/at91sam9g20dfc => configs}/at91sam9g20dfc_ext_bare_defconfig (100%) rename {target/device/Atmel/at91sam9g20dfc => configs}/at91sam9g20dfc_ext_defconfig (100%) rename {target/device/Atmel/atngw100-base => configs}/atngw100-base_defconfig (100%) rename {target/device/Atmel/atngw100 => configs}/atngw100_defconfig (100%) rename {target/device/Atmel/atstk1005 => configs}/atstk1005_defconfig (100%) rename {target/device/Atmel/atstk100x => configs}/atstk100x_defconfig (100%) rename {target/device/x86/i686 => configs}/i386_defconfig (100%) rename {target/device/x86/i686 => configs}/i686_defconfig (100%) rename {target/device/ARMLTD/integrator926 => configs}/integrator926_defconfig (100%) rename {target/device/ARMLTD/integrator926_huge => configs}/integrator926_huge_defconfig (100%) rename {target/device/KwikByte/kb9202 => configs}/kb9202_defconfig (100%) rename {target/device/valka => configs}/v100sc2_defconfig (100%) diff --git a/Makefile b/Makefile index 5497c9b45e..bbd49d415c 100644 --- a/Makefile +++ b/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 diff --git a/target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig similarity index 100% rename from target/device/Atmel/at91sam9260dfc/arm_toolchain_defconfig rename to configs/arm_toolchain_defconfig diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig similarity index 100% rename from target/device/Atmel/at91rm9200df/at91rm9200df_defconfig rename to configs/at91rm9200df_defconfig diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig similarity index 100% rename from target/device/Atmel/at91rm9200df/at91rm9200df_ext_bare_defconfig rename to configs/at91rm9200df_ext_bare_defconfig diff --git a/target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig similarity index 100% rename from target/device/Atmel/at91rm9200df/at91rm9200df_ext_defconfig rename to configs/at91rm9200df_ext_defconfig diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig similarity index 100% rename from target/device/Atmel/at91sam9260dfc/at91sam9260dfc_defconfig rename to configs/at91sam9260dfc_defconfig diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig similarity index 100% rename from target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_bare_defconfig rename to configs/at91sam9260dfc_ext_bare_defconfig diff --git a/target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig similarity index 100% rename from target/device/Atmel/at91sam9260dfc/at91sam9260dfc_ext_defconfig rename to configs/at91sam9260dfc_ext_defconfig diff --git a/target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig similarity index 100% rename from target/device/Atmel/at91sam9260pf/at91sam9260pf_defconfig rename to configs/at91sam9260pf_defconfig diff --git a/target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig similarity index 100% rename from target/device/Atmel/at91sam9261ek/at91sam9261ek_defconfig rename to configs/at91sam9261ek_defconfig diff --git a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig similarity index 100% rename from target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_bare_defconfig rename to configs/at91sam9261ek_ext_bare_defconfig diff --git a/target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig similarity index 100% rename from target/device/Atmel/at91sam9261ek/at91sam9261ek_ext_defconfig rename to configs/at91sam9261ek_ext_defconfig diff --git a/target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig similarity index 100% rename from target/device/Atmel/at91sam9263ek/at91sam9263ek_defconfig rename to configs/at91sam9263ek_defconfig diff --git a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig similarity index 100% rename from target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_bare_defconfig rename to configs/at91sam9263ek_ext_bare_defconfig diff --git a/target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig similarity index 100% rename from target/device/Atmel/at91sam9263ek/at91sam9263ek_ext_defconfig rename to configs/at91sam9263ek_ext_defconfig diff --git a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig similarity index 100% rename from target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_defconfig rename to configs/at91sam9g20dfc_defconfig diff --git a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig similarity index 100% rename from target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_bare_defconfig rename to configs/at91sam9g20dfc_ext_bare_defconfig diff --git a/target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig similarity index 100% rename from target/device/Atmel/at91sam9g20dfc/at91sam9g20dfc_ext_defconfig rename to configs/at91sam9g20dfc_ext_defconfig diff --git a/target/device/Atmel/atngw100-base/atngw100-base_defconfig b/configs/atngw100-base_defconfig similarity index 100% rename from target/device/Atmel/atngw100-base/atngw100-base_defconfig rename to configs/atngw100-base_defconfig diff --git a/target/device/Atmel/atngw100/atngw100_defconfig b/configs/atngw100_defconfig similarity index 100% rename from target/device/Atmel/atngw100/atngw100_defconfig rename to configs/atngw100_defconfig diff --git a/target/device/Atmel/atstk1005/atstk1005_defconfig b/configs/atstk1005_defconfig similarity index 100% rename from target/device/Atmel/atstk1005/atstk1005_defconfig rename to configs/atstk1005_defconfig diff --git a/target/device/Atmel/atstk100x/atstk100x_defconfig b/configs/atstk100x_defconfig similarity index 100% rename from target/device/Atmel/atstk100x/atstk100x_defconfig rename to configs/atstk100x_defconfig diff --git a/target/device/x86/i686/i386_defconfig b/configs/i386_defconfig similarity index 100% rename from target/device/x86/i686/i386_defconfig rename to configs/i386_defconfig diff --git a/target/device/x86/i686/i686_defconfig b/configs/i686_defconfig similarity index 100% rename from target/device/x86/i686/i686_defconfig rename to configs/i686_defconfig diff --git a/target/device/ARMLTD/integrator926/integrator926_defconfig b/configs/integrator926_defconfig similarity index 100% rename from target/device/ARMLTD/integrator926/integrator926_defconfig rename to configs/integrator926_defconfig diff --git a/target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig similarity index 100% rename from target/device/ARMLTD/integrator926_huge/integrator926_huge_defconfig rename to configs/integrator926_huge_defconfig diff --git a/target/device/KwikByte/kb9202/kb9202_defconfig b/configs/kb9202_defconfig similarity index 100% rename from target/device/KwikByte/kb9202/kb9202_defconfig rename to configs/kb9202_defconfig diff --git a/target/device/valka/v100sc2_defconfig b/configs/v100sc2_defconfig similarity index 100% rename from target/device/valka/v100sc2_defconfig rename to configs/v100sc2_defconfig diff --git a/docs/buildroot.html b/docs/buildroot.html index 45876d7b6b..2fc752812a 100644 --- a/docs/buildroot.html +++ b/docs/buildroot.html @@ -646,22 +646,15 @@ endif
  • Then, in the target/device/yourcompany/project-foobar/ - directory, you can store different files: - -
      - -
    • One or more Buildroot configurations, under file named - something_defconfig. Your users will then be able - to run make something_defconfig and get the right - configuration for your project
      • - -
    • Configuration files for the kernel, for Busybox or - uClibc. These files can then be referenced by the Buildroot - configuration described above
      • - -
    - -
    • + 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 + something_defconfig and are stored in the toplevel + configs/ directory. Your users will then be able + to run make something_defconfig and get the right + configuration for your project -- 2.30.2