Add initram config

diff --git a/Makefile b/Makefile
index 2747982738a0343dd4c42b0c51dde77c01e32c7f..4b36d1c8041b10ffc64448d3fd295196ab230bb7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-.PHONY: all help parse_kconfig write_config build run test clean clean_linux clean_buildroot mlinux mbuildroot
+.PHONY: all help parse_kconfig write_config build run test clean clean_linux clean_buildroot mlinux mbuildroot deflinux
 
-include .conf.mk
+-include .conf.mk
 
 all: parse_kconfig write_config
 
@@ -33,10 +33,10 @@ mlinux:
 deflinux:
        ARCH=$(SRCARCH) $(MAKE) -C linux defconfig
 
-test: build/initram.gz
+test: $(INITRAM)
        @ #TODO
 
-run: kconfig_parser write_config build/initram.gz
+run: kconfig_parser write_config $(INITRAM)
        scripts/main_loop.py
 
 evaluate:
@@ -64,11 +64,14 @@ parse_kconfig:
 write_config:
        @$(MAKE) -C scripts/write_config/
 
-build:
-       mkdir $@
+%:
+       mkdir -p $@
 
-build/initram.gz: scripts/buildroot/.config build
+$(BUILDROOT_INITRAM): scripts/buildroot/.config
        @$(MAKE) -C scripts/buildroot
-       mv scripts/buildroot/output/images/rootfs.cpio.gz
+
+$(INITRAM): $(BUILDROOT_INITRAM) $${@D}
+       mv $^ $@
 
 scripts/buildroot/.config: mbuildroot
+       @

diff --git a/conf.py b/conf.py
index 90f2b1285c5c473d4ce3bdb5830e8a7d5bcc0460..7d4874b4094583a08bf5f7ecd70f2e1618bde162 100644 (file)
--- a/conf.py
+++ b/conf.py
@@ -23,6 +23,7 @@ dot_confmk = pf('.conf.mk')
 linux_sources = pf('linux')
 linux_kconfig_head = 'Kconfig'
 linux_dot_config = linux_sources + '/.config'
+linux_image = linux_sources + '/arch/' + ARCH + '/boot/bzImage'
 
 build_folder = pf('build/')
 phase_file = build_folder + '/phase'
@@ -35,6 +36,9 @@ dot_config_back_file = build_folder + '/dot_config_back'
 solution_file = build_folder + '/solution'
 iteration_file = build_folder + '/iteration'
 
+buildroot_initram = pf('scripts/buildroot/output/images/rootfs.cpio.gz')
+initram = build_folder + '/initram.gz'
+
 # Programs paths
 parse_kconfig = checkXf(pf('scripts/parse_kconfig/parse'), 'You must build programs first.')
 write_config = checkXf(pf('scripts/write_config/write'), 'You must build programs first.')

diff --git a/scripts/confmk.py b/scripts/confmk.py
index ef275432a294d23e9e87a9200134b306f22d2b2b..a508d399a74089bd1ca372bca4a41292178935ce 100755 (executable)
--- a/scripts/confmk.py
+++ b/scripts/confmk.py
@@ -12,6 +12,9 @@ def gen_confmk():
        with open(conf.dot_confmk, 'w') as f:
                f.write("# This file is generated. Please don't edit this file.\n")
                f.write("SRCARCH := " + conf.SRCARCH + "\n")
+               f.write("\n")
+               f.write("BUILDROOT_INITRAM := " + conf.buildroot_initram + "\n")
+               f.write("INITRAM := " + conf.initram + "\n")
 
 #################################################################################