Skip to content

Commit

Permalink
poplar: misc updates needed for Linux 5.5
Browse files Browse the repository at this point in the history
1. Drop workarounds for GCC 8.x
2. Provide eMMC as env variable, which is used in extlinux.conf
distroboot script.
3. Use default defconfig for all arm64.
4. Merge additional poplar.conf

Signed-off-by: Igor Opaniuk <[email protected]>
  • Loading branch information
igoropaniuk committed May 11, 2020
1 parent e448324 commit 8b252a9
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions poplar.mk
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,12 @@ l-loader-clean:
################################################################################
LINUX_DEFCONFIG_COMMON_ARCH := arm64
LINUX_DEFCONFIG_COMMON_FILES := \
$(LINUX_PATH)/arch/arm64/configs/poplar_defconfig \
$(LINUX_PATH)/arch/arm64/configs/defconfig \
$(CURDIR)/kconfigs/poplar.conf

linux-defconfig: $(LINUX_PATH)/.config

LINUX_COMMON_FLAGS += ARCH=arm64
# Avoid compile errors with GCC 8.x. These flags may be removed when
# https://github.com/96boards-poplar/linux/pull/3 is merged.
LINUX_COMMON_FLAGS += CFLAGS_drv_hifb_proc.o=-Wno-stringop-truncation \
CFLAGS_drv_pvr_intf.o=-Wno-sizeof-pointer-memaccess \
CFLAGS_drv_display.o=-Wno-array-bounds

linux: linux-common

Expand All @@ -163,7 +159,8 @@ prepare-images: linux l-loader buildroot
@cp $(LINUX_PATH)/arch/arm64/boot/Image $(OUT_PATH)
@cp $(LINUX_DTB) $(OUT_PATH)
@cd $(OUT_PATH) && PATH=$(UBOOT_PATH)/tools:$$PATH \
bash ./poplar_recovery_builder.sh all "$(ROOTFS_BIN)"
EMMC_DEV=/dev/mmcblk1 ./poplar_recovery_builder.sh \
all "$(ROOTFS_BIN)"

################################################################################
# Buildroot/RootFS
Expand Down

0 comments on commit 8b252a9

Please sign in to comment.