summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/config.in1
-rw-r--r--arch/ia64/experimental0
-rw-r--r--arch/sh/config.in1
-rw-r--r--arch/sh/experimental0
-rw-r--r--kconfig/kconfig.mk44
5 files changed, 24 insertions, 22 deletions
diff --git a/arch/ia64/config.in b/arch/ia64/config.in
index e015c28..ad0d9fd 100644
--- a/arch/ia64/config.in
+++ b/arch/ia64/config.in
@@ -1,4 +1,5 @@
# ia64 specific config options
+# EXPERIMENTAL
config ARCH_ia64
select ARCH_SUPPORTS_BOTH_ENDIAN
diff --git a/arch/ia64/experimental b/arch/ia64/experimental
deleted file mode 100644
index e69de29..0000000
--- a/arch/ia64/experimental
+++ /dev/null
diff --git a/arch/sh/config.in b/arch/sh/config.in
index a1eba3a..b21ee1b 100644
--- a/arch/sh/config.in
+++ b/arch/sh/config.in
@@ -1,4 +1,5 @@
# Super-H specific configuration file
+# EXPERIMENTAL
config ARCH_sh
select ARCH_SUPPORTS_BOTH_ENDIAN
diff --git a/arch/sh/experimental b/arch/sh/experimental
deleted file mode 100644
index e69de29..0000000
--- a/arch/sh/experimental
+++ /dev/null
diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk
index 3db74a2..4aae796 100644
--- a/kconfig/kconfig.mk
+++ b/kconfig/kconfig.mk
@@ -39,32 +39,32 @@ KERNELS = $(patsubst $(CT_LIB_DIR)/config/kernel/%.in,%,$(KERN_CONFIG_FILES))
$(GEN_CONFIG_FILES): $(CT_TOP_DIR)/config.gen \
$(CT_LIB_DIR)/kconfig/kconfig.mk
-$(CT_TOP_DIR)/config.gen:
+$(CT_TOP_DIR)/config.gen: $(KCONFIG_TOP)
@mkdir -p $(CT_TOP_DIR)/config.gen
$(CT_TOP_DIR)/config.gen/arch.in: $(ARCH_CONFIG_FILES)
@echo ' IN config.gen/arch.in'
- @(echo "# Architectures menu"; \
- echo "# Generated file, do not edit!!!"; \
- echo ""; \
- for arch in $(ARCHS); do \
- _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;'); \
- echo "config ARCH_$${_arch}"; \
- echo " bool"; \
- printf " prompt \"$${arch}"; \
- if [ -f $(CT_LIB_DIR)/arch/$${arch}/experimental ]; then \
- echo " (EXPERIMENTAL)\""; \
- echo " depends on EXPERIMENTAL"; \
- else \
- echo "\""; \
- fi; \
- echo "if ARCH_$${_arch}"; \
- echo "config ARCH"; \
- echo " default \"$${arch}\" if ARCH_$${_arch}"; \
- echo "source config/arch/$${arch}/config.in"; \
- echo "endif"; \
- echo ""; \
- done; \
+ @(echo "# Architectures menu"; \
+ echo "# Generated file, do not edit!!!"; \
+ echo ""; \
+ for arch in $(ARCHS); do \
+ _arch=$$(echo "$${arch}" |sed -r -s -e 's/[-.+]/_/g;'); \
+ echo "config ARCH_$${_arch}"; \
+ echo " bool"; \
+ printf " prompt \"$${arch}"; \
+ if grep -E '^# +EXPERIMENTAL$$' config/arch/$${arch}/config.in >/dev/null 2>&1; then \
+ echo " (EXPERIMENTAL)\""; \
+ echo " depends on EXPERIMENTAL"; \
+ else \
+ echo "\""; \
+ fi; \
+ echo "if ARCH_$${_arch}"; \
+ echo "config ARCH"; \
+ echo " default \"$${arch}\" if ARCH_$${_arch}"; \
+ echo "source config/arch/$${arch}/config.in"; \
+ echo "endif"; \
+ echo ""; \
+ done; \
) >$@
$(CT_TOP_DIR)/config.gen/kernel.in: $(KERN_CONFIG_FILES)