From 788fa9127f950776e3b9ec25916d9f061130669f Mon Sep 17 00:00:00 2001 From: shiyu1314 <1052672227@qq.com> Date: Fri, 13 Oct 2023 13:53:09 +0800 Subject: [PATCH] meson: Kernel supports docker (#11591) --- target/linux/meson/Makefile | 2 -- target/linux/meson/image/Makefile | 8 ++--- ..._aml_sdcard_img.sh => gen_aml_emmc_img.sh} | 0 target/linux/meson/meson8b/config-6.1 | 29 +++++++++++++++++++ 4 files changed, 33 insertions(+), 6 deletions(-) rename target/linux/meson/image/{gen_aml_sdcard_img.sh => gen_aml_emmc_img.sh} (100%) diff --git a/target/linux/meson/Makefile b/target/linux/meson/Makefile index 59d3d654a00c4b..1b274a0c186c43 100644 --- a/target/linux/meson/Makefile +++ b/target/linux/meson/Makefile @@ -24,8 +24,6 @@ DEFAULT_PACKAGES += \ mkf2fs \ automount \ resize2fs \ - parted \ - losetup \ partx-utils KERNELNAME:=Image dtbs diff --git a/target/linux/meson/image/Makefile b/target/linux/meson/image/Makefile index ebb8c2d1c0c5c2..2aac6a2fafaf36 100644 --- a/target/linux/meson/image/Makefile +++ b/target/linux/meson/image/Makefile @@ -13,7 +13,7 @@ define Build/boot-script mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot.scr" -d boot.txt $(KDIR)/boot.scr endef -define Build/sdcard-common +define Build/emmc-common $(RM) -f $@.boot mkfs.fat -C $@.boot $(FAT32_BLOCKS) @@ -29,14 +29,14 @@ define Build/sdcard-common $(RM) -rf $(KDIR)/boot.fat - ./gen_aml_sdcard_img.sh $@ $@.boot $(IMAGE_ROOTFS) \ + ./gen_aml_emmc_img.sh $@ $@.boot $(IMAGE_ROOTFS) \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) endef ### Devices ### define Device/Default FILESYSTEMS := ext4 - IMAGES := sdcard.img + IMAGES := emmc.img KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_LOADADDR := 0x01080000 KERNEL_NAME := Image @@ -48,7 +48,7 @@ define Device/thunder-onecloud DEVICE_DTS := meson8b-onecloud DEVICE_TITLE := Thunder OneCloud KERNEL_LOADADDR := 0x00208000 - IMAGE/sdcard.img := boot-script onecloud | sdcard-common $$(DEVICE_NAME) + IMAGE/emmc.img := boot-script onecloud | emmc-common $$(DEVICE_NAME) endef ifeq ($(SUBTARGET),meson8b) TARGET_DEVICES += thunder-onecloud diff --git a/target/linux/meson/image/gen_aml_sdcard_img.sh b/target/linux/meson/image/gen_aml_emmc_img.sh similarity index 100% rename from target/linux/meson/image/gen_aml_sdcard_img.sh rename to target/linux/meson/image/gen_aml_emmc_img.sh diff --git a/target/linux/meson/meson8b/config-6.1 b/target/linux/meson/meson8b/config-6.1 index 986e824d5e87e6..4d67b29e1883ed 100644 --- a/target/linux/meson/meson8b/config-6.1 +++ b/target/linux/meson/meson8b/config-6.1 @@ -32,15 +32,32 @@ CONFIG_ARM_VIRT_EXT=y CONFIG_ASN1=y CONFIG_AUTO_ZRELADDR=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y +CONFIG_BLK_CGROUP=y CONFIG_BLK_DEBUG_FS=y # CONFIG_BLK_DEV_INITRD is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_PM=y +# CONFIG_BPF_STREAM_PARSER is not set CONFIG_CACHE_L2X0=y CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y +CONFIG_CGROUP_CPUACCT=y +# CONFIG_CGROUP_DEBUG is not set +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_FAVOR_DYNMODS=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_MISC=y +# CONFIG_CGROUP_NET_CLASSID is not set +# CONFIG_CGROUP_NET_PRIO is not set +CONFIG_CGROUP_PIDS=y +# CONFIG_CGROUP_RDMA is not set +CONFIG_CGROUP_SCHED=y +CONFIG_CGROUP_WRITEBACK=y CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y CONFIG_CLKSRC_MMIO=y CONFIG_CLONE_BACKWARDS=y @@ -72,6 +89,7 @@ CONFIG_CONTIG_ALLOC=y CONFIG_COREDUMP=y CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y +CONFIG_CPUSETS=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV7=y @@ -143,9 +161,11 @@ CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_FAIR_GROUP_SCHED=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y # CONFIG_FORTIFY_SOURCE is not set +CONFIG_FREEZER=y CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y @@ -207,6 +227,8 @@ CONFIG_I2C_BOARDINFO=y CONFIG_I2C_MESON=y CONFIG_ICPLUS_PHY=y CONFIG_IIO=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y CONFIG_INPUT=y CONFIG_IPV6=y CONFIG_IPV6_MROUTE=y @@ -244,6 +266,8 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=y CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVRES=y # CONFIG_MDIO_GPIO is not set +CONFIG_MEMCG=y +CONFIG_MEMCG_KMEM=y CONFIG_MEMFD_CREATE=y CONFIG_MEMORY=y CONFIG_MEMORY_ISOLATION=y @@ -287,6 +311,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y CONFIG_NET_CLS_ACT=y +# CONFIG_NET_CLS_CGROUP is not set CONFIG_NET_EMATCH=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y @@ -311,6 +336,7 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PADATA=y +CONFIG_PAGE_COUNTER=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_POOL=y CONFIG_PAGE_SIZE_LESS_THAN_256KB=y @@ -348,6 +374,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_PPS=y CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PRINTK_TIME=y +CONFIG_PROC_PID_CPUSET=y CONFIG_PTP_1588_CLOCK=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_PWM=y @@ -376,6 +403,7 @@ CONFIG_RTC_DRV_MESON=y # CONFIG_RTC_DRV_MESON_VRTC is not set CONFIG_RTC_I2C_AND_SPI=y CONFIG_RTC_MC146818_LIB=y +# CONFIG_RT_GROUP_SCHED is not set CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCSI=y @@ -390,6 +418,7 @@ CONFIG_SERIAL_MESON_CONSOLE=y CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y +CONFIG_SOCK_CGROUP_DATA=y CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_SOC_BUS=y CONFIG_SOFTIRQ_ON_OWN_STACK=y