From 8d0b4980ebd1240ecc308dbe5e4d6ccf1e4dc76c Mon Sep 17 00:00:00 2001
From: jbnadal <jbnadal@awox.com>
Date: Tue, 9 Jan 2018 15:02:18 +0100
Subject: [PATCH] Sync .mk and configuration.

---
 bsp/buildroot_external/external.mk            |  7 +++
 bsp/include/buildroot.mk                      | 62 +++++++++----------
 projects/rpi_domo/configs/buildroot_defconfig |  4 +-
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/bsp/buildroot_external/external.mk b/bsp/buildroot_external/external.mk
index a75366d0..0019bf2f 100644
--- a/bsp/buildroot_external/external.mk
+++ b/bsp/buildroot_external/external.mk
@@ -1 +1,8 @@
 include $(sort $(wildcard $(BR2_EXTERNAL_DOMO_PATH)/package/*/*.mk))
+
+domo.clean: 
+	$(BR_PROJECT)/../../../scripts/clean_external_packages.sh $(BR_STAGING)/buildroot/build/ $(BR2_EXTERNAL)/package/
+
+awoxsoft.rebuild: domo.clean
+	make -C $(BR_STAGING)/buildroot
+	
\ No newline at end of file
diff --git a/bsp/include/buildroot.mk b/bsp/include/buildroot.mk
index 8eb65af8..4f350cfd 100644
--- a/bsp/include/buildroot.mk
+++ b/bsp/include/buildroot.mk
@@ -1,22 +1,16 @@
-
+#
+#
 
 BR2_EXTERNAL ?= $(BR_PROJECT)/../../bsp/buildroot_external/
 
-BR_PROJECT_CONFIG = buildroot_defconfig
-BR_PROJECT_CONFIG_PATH = $(BR_PROJECT)/configs/$(BR_PROJECT_CONFIG)
-
-BR_TOOLCHAIN_CONFIG = toolchain_defconfig
-BR_TOOLCHAIN_CONFIG_PATH = $(BR_PROJECT)/configs/$(BR_TOOLCHAIN_CONFIG)
-
-BR_ENV = BR2_EXTERNAL=$(BR2_EXTERNAL) O=$(BR_STAGING)/buildroot/ WORKSPACE_DIR=$(BR_STAGING)
+BR_ENV =  BR2_EXTERNAL=$(BR2_EXTERNAL) O=$(BR_STAGING)/buildroot/ WORKSPACE_DIR=$(BR_STAGING)
 BR_ENV += BUILDS_ROOT=$(BR_LOCAL_BUILDS_ROOT) BOARD=$(BR_BOARD) PROJECT=$(BR_PROJECT)
-BR_ENV += BR2_DEFCONFIG_FROM_ENV=1
+BR_ENV += BR2_DEFCONFIG=$(BR_PROJECT)/configs/buildroot_defconfig BR2_DEFCONFIG_FROM_ENV=1
 
-# Project.
 buildroot.menuconfig: buildroot.config
-	$(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_PROJECT_CONFIG_PATH) -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig
+	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig
 	@echo "Saving defconfig (Waiting) ...."
-	$(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_PROJECT_CONFIG_PATH) -C $(BR_PROJECT)/../../bsp/buildroot/ savedefconfig
+	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ savedefconfig
 	@echo "Saving defconfig done."
 
 buildroot: buildroot.config
@@ -27,29 +21,31 @@ buildroot.shell: buildroot.config
 	$(eval export $(BR_ENV))
 	cd $(BR_STAGING)/buildroot/; $(BR_ENV) bash
 
-buildroot.config:
+buildroot.config: $(BR_STAGING)/buildroot/.config
+
+$(BR_STAGING)/buildroot/.config: $(BR_PROJECT)/configs/buildroot_defconfig
+	@mkdir -p $(BR_STAGING)/buildroot/
+	@cp $(BR_PROJECT)/configs/buildroot_defconfig $(BR_STAGING)/buildroot/.config
+	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ defconfig
+
+# should be deprecated.
+buildroot.menuconfig.old: buildroot.config.old
+	$(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig
+	cmp -s $(BR_STAGING)/buildroot/.config $(BR_PROJECT)/configs/buildroot.config; \
+	if test $$? -ne 0; then echo "Config Files has changed......"; \
+		cp $(BR_STAGING)/buildroot/.config $(BR_PROJECT)/configs/buildroot.config; \
+	fi
+
+buildroot.config.old:
 	@mkdir -p $(BR_STAGING)/buildroot/
 ifeq ("$(wildcard $(BR_STAGING)/buildroot/.config)","")
-	@cp $(BR_PROJECT_CONFIG_PATH) $(BR_STAGING)/buildroot/.config
-	$(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_PROJECT_CONFIG_PATH) -C $(BR_PROJECT)/../../bsp/buildroot/ defconfig
+	@cp $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config
+else
+	cmp -s $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config; \
+	if test $$? -ne 0; then echo "Config Files has changed......"; \
+		cp $(BR_PROJECT)/configs/buildroot.config $(BR_STAGING)/buildroot/.config; \
+	fi
 endif
 
-# Toolchain.
-toolchain.menuconfig: toolchain.config
-	$(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_TOOLCHAIN_CONFIG_PATH) -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig
-	@echo "Saving defconfig (Waiting) ...."
-	$(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_TOOLCHAIN_CONFIG_PATH) -C $(BR_PROJECT)/../../bsp/buildroot/ savedefconfig
-	@echo "Saving defconfig done."
-
-toolchain.config:
-	@mkdir -p $(BR_STAGING)/buildroot/
-ifeq ("$(wildcard $(BR_STAGING)/buildroot/.config)","")
-	@cp $(BR_TOOLCHAIN_CONFIG_PATH) $(BR_STAGING)/buildroot/.config
-	$(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_TOOLCHAIN_CONFIG_PATH) -C $(BR_PROJECT)/../../bsp/buildroot/ defconfig
-endif
-
-toolchain.archive:
-	cd $(BR_STAGING)/cross/usr; tar cvjf $(BR_STAGING)/toolchain.tar.bz2 *
-
 install.sd:
-	sudo dd if=$(BR_STAGING)/buildroot/images/sdcard.img of=/dev/sdb && sync && sync
+	sudo dd if=$(BR_STAGING)/buildroot/images/sdcard.img of=/dev/mmcblk0 && sync && sync
diff --git a/projects/rpi_domo/configs/buildroot_defconfig b/projects/rpi_domo/configs/buildroot_defconfig
index 03350aec..af4e4228 100644
--- a/projects/rpi_domo/configs/buildroot_defconfig
+++ b/projects/rpi_domo/configs/buildroot_defconfig
@@ -12,7 +12,8 @@ BR2_TOOLCHAIN_EXTERNAL_GCC_5=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
-BR2_TARGET_GENERIC_HOSTNAME=""
+BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
+BR2_TARGET_GENERIC_HOSTNAME="rpi_Domo"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Domo"
 BR2_INIT_NONE=y
 BR2_ROOTFS_DEVICE_TABLE=""
@@ -43,7 +44,6 @@ BR2_TARGET_ROOTFS_CPIO_LZO=y
 BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-# BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="rpi"
 BR2_TARGET_UBOOT_NEEDS_DTC=y