@@ -14,7 +14,7 @@ obj-y =
obj-y += virtio.o virtio-pci.o
obj-y += fw_cfg.o
obj-y += watchdog.o
-obj-y += nand.o
+obj-$(CONFIG_NAND) += nand.o
obj-$(CONFIG_ECC) += ecc.o
obj-$(CONFIG_M48T59) += m48t59.o
obj-$(CONFIG_ESCC) += escc.o
@@ -1824,6 +1824,7 @@ m48t59=no
escc=no
esp=no
ecc_flash=no
+nand=no
for target in $target_list; do
target_dir="$target"
@@ -2056,6 +2057,7 @@ if test "$target_softmmu" = "yes" ; then
sd_flash=yes
ptimer=yes
ecc_flash=yes
+ nand=yes
;;
sparc)
ptimer=yes
@@ -2075,6 +2077,9 @@ if test "$target_softmmu" = "yes" ; then
mips*)
esp=yes
;;
+ cris)
+ nand=yes
+ ;;
esac
fi
if test "$target_user_only" = "yes" ; then
@@ -2305,6 +2310,10 @@ if test "$ecc_flash" = "yes" ; then
echo "CONFIG_ECC=y" >> $config_host_mak
fi
+if test "$nand" = "yes" ; then
+ echo "CONFIG_NAND=y" >> $config_host_mak
+fi
+
echo "/* Automatically generated by configure - do not modify */" > $config_host_h
/bin/sh $source_path/create_config < $config_host_mak >> $config_host_h
Signed-off-by: Juan Quintela <quintela@redhat.com> --- Makefile.hw | 2 +- configure | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-)