From 5998ed15ee978f122f2043ccff819179ce170730 Mon Sep 17 00:00:00 2001 From: NADAL Jean-Baptiste Date: Fri, 25 Oct 2019 22:12:26 +0200 Subject: [PATCH] Add full system conf --- bsp/board/rpi/main.mk | 2 +- bsp/include/toolchain.mk | 10 +++--- .../rpi_minimal/configs/buildroot_defconfig | 32 +++++++++++++++++++ .../configs/toolchain_defconfig.ok | 28 ---------------- 4 files changed, 38 insertions(+), 34 deletions(-) create mode 100644 projects/rpi_minimal/configs/buildroot_defconfig delete mode 100644 projects/rpi_minimal/configs/toolchain_defconfig.ok diff --git a/bsp/board/rpi/main.mk b/bsp/board/rpi/main.mk index 322b9fd9..0f84dadf 100644 --- a/bsp/board/rpi/main.mk +++ b/bsp/board/rpi/main.mk @@ -8,5 +8,5 @@ all: msg buildroot include ../../bsp/include/rules.mk include ../../bsp/include/buildroot.mk -include ../../bsp/include/toolchain.mk +#include ../../bsp/include/toolchain.mk include ../../bsp/include/dtb.mk diff --git a/bsp/include/toolchain.mk b/bsp/include/toolchain.mk index 9c057e3b..9e51d94e 100644 --- a/bsp/include/toolchain.mk +++ b/bsp/include/toolchain.mk @@ -5,22 +5,22 @@ BR2_EXTERNAL ?= $(BR_PROJECT)/../../bsp/buildroot_external/ 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=$(BR_PROJECT)/configs/toolchain_defconfig BR2_DEFCONFIG_FROM_ENV=1 +BR_ENV += BR2_DEFCONFIG_FROM_ENV=1 BR_ENV += LD_LIBRARY_PATH=$(BR_STAGING)/cross/opt/ext-toolchain/lib/ toolchain.menuconfig: toolchain.config - $(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig + $(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_PROJECT)/configs/toolchain_defconfig -C $(BR_PROJECT)/../../bsp/buildroot/ menuconfig @echo "Saving defconfig (Waiting) ...." - $(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ savedefconfig + $(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_PROJECT)/configs/toolchain_defconfig -C $(BR_PROJECT)/../../bsp/buildroot/ savedefconfig @echo "Saving defconfig done." toolchain.config: $(BR_PROJECT)/configs/toolchain_defconfig @mkdir -p $(BR_STAGING)/buildroot/ @cp $(BR_PROJECT)/configs/toolchain_defconfig $(BR_STAGING)/buildroot/.config - $(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ defconfig + $(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_PROJECT)/configs/toolchain_defconfig -C $(BR_PROJECT)/../../bsp/buildroot/ defconfig toolchain: toolchain.config - $(MAKE) $(BR_ENV) -C $(BR_PROJECT)/../../bsp/buildroot/ $(BR_TARGET) + $(MAKE) $(BR_ENV) BR2_DEFCONFIG=$(BR_PROJECT)/configs/toolchain_defconfig -C $(BR_PROJECT)/../../bsp/buildroot/ $(BR_TARGET) toolchain.archive: $(BR_PROJECT)/../../bsp/scripts/toolchain_build.sh $(BR_STAGING)/cross $(BR_LOCAL_BUILDS_ROOT)/delivery/ diff --git a/projects/rpi_minimal/configs/buildroot_defconfig b/projects/rpi_minimal/configs/buildroot_defconfig new file mode 100644 index 00000000..6b7bb164 --- /dev/null +++ b/projects/rpi_minimal/configs/buildroot_defconfig @@ -0,0 +1,32 @@ +BR2_arm=y +BR2_arm1176jzf_s=y +BR2_DL_DIR="$(BUILDS_ROOT)/dl" +BR2_HOST_DIR="$(WORKSPACE_DIR)/cross" +BR2_PRIMARY_SITE="http://cdn.nadal-fr.com/buildroot" +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y +BR2_TOOLCHAIN_EXTERNAL_URL="http://serveur.nadal-fr.com/toolchains/toochain_arm-buildroot-linux-gnueabihf-gcc-7.4.0-glibc-2019.02.6.tgz" +BR2_TOOLCHAIN_EXTERNAL_GCC_7=y +BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y +BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y +BR2_TOOLCHAIN_EXTERNAL_CXX=y +BR2_SYSTEM_DHCP="eth0" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi/post-image.sh" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="ssh://git@git.nadal-fr.com:222/rpi/linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="tags/4_14_95" +BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL)/patches/linux/rpi" +BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm" +BR2_PACKAGE_RPI_FIRMWARE=y +# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="65M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y diff --git a/projects/rpi_minimal/configs/toolchain_defconfig.ok b/projects/rpi_minimal/configs/toolchain_defconfig.ok deleted file mode 100644 index a870cbc8..00000000 --- a/projects/rpi_minimal/configs/toolchain_defconfig.ok +++ /dev/null @@ -1,28 +0,0 @@ -BR2_arm=y -BR2_arm1176jzf_s=y -BR2_DL_DIR="$(BUILDS_ROOT)/dl" -BR2_HOST_DIR="$(WORKSPACE_DIR)/cross" -BR2_PRIMARY_SITE="http://cdn.nadal-fr.com/buildroot" -BR2_PACKAGE_OVERRIDE_FILE="$(BOARD)/local.mk" -BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL)/patches" -BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_PACKAGE_HOST_GDB=y -BR2_TARGET_GENERIC_HOSTNAME="rpi_Domo" -BR2_TARGET_GENERIC_ISSUE="Welcome to Domo" -BR2_INIT_NONE=y -BR2_ROOTFS_DEVICE_TABLE="" -BR2_SYSTEM_BIN_SH_NONE=y -# BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set -# BR2_PACKAGE_BUSYBOX is not set -BR2_PACKAGE_WIRINGPI=y -BR2_PACKAGE_LIBDAEMON=y -BR2_PACKAGE_LIBUBOX=y -# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set -# BR2_TARGET_ROOTFS_TAR is not set -BR2_PACKAGE_HOST_DOSFSTOOLS=y -BR2_PACKAGE_HOST_DTC=y -BR2_PACKAGE_HOST_E2FSPROGS=y -BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_MTOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y