From: Roland Hieber <r.hieber@pengutronix.de>
To: distrokit@pengutronix.de
Subject: [DistroKit] bring platform-rpi and platform-v8a in line with master
Date: Wed, 26 Sep 2018 10:30:13 +0200 [thread overview]
Message-ID: <20180926083013.vuuyjaaqtz42ewcw@pengutronix.de> (raw)
Hello Robert,
platform-rpi and platform-v8a were not bumped along with -v7a to the
latest ptxdist version, and platform-rpi currently does not build since
the image section migration in ptxdist-2018.06. Here are some small
changes to make both platforms build again with the current master. For
platform-rpi, reason still complains a lot, but I guess less warnings
now is still better than no warnings at a later time.
The following changes since commit 0ff9f697fe7cf5aeb88a8c7142fab380d8ccf083:
ptxdist: version bump 2018.06.0 -> 2018.08.0 (2018-08-16 10:16:34 +0200)
are available in the Git repository at:
https://git.pengutronix.de/git/rhi/DistroKit
for you to fetch changes up to 461649ad80e53a1381f7c56923281410e86896ac:
platform-rpi: kernel: enable CONFIG_BPF as suggested by reason (2018-09-18 12:53:32 +0200)
----------------------------------------------------------------
Roland Hieber (4):
platform-v8a: ptxdist: version bump 2018.06.0 -> 2018.08.0
platform-rpi: image-boot-vfat: update section name
platform-rpi: ptxdist: version bump 2018.06.0 -> 2018.08.0
platform-rpi: kernel: enable CONFIG_BPF as suggested by reason
configs/platform-rpi/kernelconfig | 7 ++-
configs/platform-rpi/platformconfig | 55 ++++++++++-------------
configs/platform-rpi/platforms/image-boot-vfat.in | 2 +-
configs/platform-v8a/platformconfig | 49 +++++++++-----------
4 files changed, 49 insertions(+), 64 deletions(-)
diff --git a/configs/platform-rpi/kernelconfig b/configs/platform-rpi/kernelconfig
index 2ddf973..f0b8231 100644
--- a/configs/platform-rpi/kernelconfig
+++ b/configs/platform-rpi/kernelconfig
@@ -121,8 +121,9 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_SOCK_CGROUP_DATA is not set
+CONFIG_SOCK_CGROUP_DATA=y
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
@@ -169,7 +170,7 @@ CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
CONFIG_EVENTFD=y
-# CONFIG_BPF_SYSCALL is not set
+CONFIG_BPF_SYSCALL=y
CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_ADVISE_SYSCALLS=y
@@ -728,6 +729,7 @@ CONFIG_HAVE_NET_DSA=y
CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
# CONFIG_BPF_JIT is not set
+# CONFIG_BPF_STREAM_PARSER is not set
#
# Network testing
@@ -2764,6 +2766,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
CONFIG_STACK_TRACER=y
# CONFIG_BLK_DEV_IO_TRACE is not set
CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
CONFIG_PROBE_EVENTS=y
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
diff --git a/configs/platform-rpi/platformconfig b/configs/platform-rpi/platformconfig
index 1af0223..3218d28 100644
--- a/configs/platform-rpi/platformconfig
+++ b/configs/platform-rpi/platformconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# PTXdist 2018.05.0
+# PTXdist 2018.08.0
#
PTXCONF__platformconfig_MAGIC__=y
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="rpi"
PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
PTXCONF_RUNTIME=y
PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2018.05.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2018.08.0"
#
# architecture
@@ -40,6 +40,7 @@ PTXCONF_ARCH_ARM=y
# PTXCONF_ARCH_CRIS is not set
# PTXCONF_ARCH_PARISC is not set
# PTXCONF_ARCH_SH is not set
+# PTXCONF_ARCH_RISCV is not set
PTXCONF_ARCH_SUPPORTS_ENDIAN_BIG=y
PTXCONF_ARCH_SUPPORTS_ENDIAN_LITTLE=y
# PTXCONF_ENDIAN_BIG is not set
@@ -182,7 +183,6 @@ PTXCONF_BOOTLOADER=y
# i.MX HAB
#
# PTXCONF_HOST_IMX_CST is not set
-# PTXCONF_U_BOOT_V2 is not set
# PTXCONF_U_BOOT is not set
# PTXCONF_X_LOAD is not set
@@ -194,41 +194,22 @@ PTXCONF_BOOTLOADER=y
#
# image creation options
#
-# PTXCONF_IMAGE_BOOT_MLO_VFAT is not set
-# PTXCONF_IMAGE_CPIO is not set
-# PTXCONF_IMAGE_CPIO_GZ is not set
-# PTXCONF_IMAGE_EXT2 is not set
-# PTXCONF_IMAGE_HD is not set
-# PTXCONF_IMAGE_VDI is not set
-
-#
-# ipkg options
-#
-# PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY is not set
-# PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY is not set
-PTXCONF_IMAGE_IPKG_INDEX=y
-PTXCONF_IMAGE_XPKG_EXTRA_ARGS=""
-# PTXCONF_IMAGE_JFFS2 is not set
-PTXCONF_IMAGE_KERNEL=y
-# PTXCONF_IMAGE_KERNEL_INITRAMFS is not set
-PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
-# PTXCONF_IMAGE_KERNEL_LZOP is not set
-# PTXCONF_IMAGE_SQUASHFS is not set
-# PTXCONF_IMAGE_TGZ is not set
-# PTXCONF_IMAGE_UBI is not set
-# PTXCONF_IMAGE_UBIFS is not set
-# PTXCONF_IMAGE_UIMAGE is not set
-
-#
-# new image creation options
-#
# PTXCONF_IMAGE_BOOT_MLO is not set
PTXCONF_IMAGE_BOOT_VFAT=y
PTXCONF_IMAGE_BOOT_VFAT_GPU_MEM=16
+# PTXCONF_IMAGE_HD_VDI is not set
PTXCONF_IMAGE_HDIMG=y
# PTXCONF_IMAGE_HDIMG_NONE is not set
# PTXCONF_IMAGE_HDIMG_BAREBOX is not set
PTXCONF_IMAGE_HDIMG_VFAT=y
+PTXCONF_IMAGE_KERNEL=y
+
+#
+# Generate images/linuximage
+#
+# PTXCONF_IMAGE_KERNEL_INITRAMFS is not set
+PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
+# PTXCONF_IMAGE_KERNEL_LZOP is not set
# PTXCONF_IMAGE_RAUC is not set
# PTXCONF_IMAGE_ROOT_CPIO_GZ is not set
# PTXCONF_IMAGE_ROOT_CPIO is not set
@@ -238,9 +219,19 @@ PTXCONF_IMAGE_ROOT_EXT_SIZE="120%"
# PTXCONF_IMAGE_ROOT_EXT_EXT3 is not set
PTXCONF_IMAGE_ROOT_EXT_EXT4=y
PTXCONF_IMAGE_ROOT_EXT_TYPE="ext4"
+# PTXCONF_IMAGE_ROOT_SQUASHFS is not set
PTXCONF_IMAGE_ROOT_TGZ=y
+PTXCONF_IMAGE_ROOT_TGZ_LABEL=""
# PTXCONF_IMAGE_ROOT_UBI is not set
# PTXCONF_IMAGE_ROOT_UBIFS is not set
+
+#
+# ipkg options
+#
+# PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY is not set
+# PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY is not set
+PTXCONF_IMAGE_IPKG_INDEX=y
+PTXCONF_IMAGE_XPKG_EXTRA_ARGS=""
# PTXCONF_HOST_ACL is not set
# PTXCONF_HOST_ATTR is not set
# PTXCONF_HOST_BZIP2 is not set
@@ -272,11 +263,11 @@ PTXCONF_HOST_LZOP=y
# PTXCONF_HOST_MTD_UTILS is not set
PTXCONF_HOST_MTOOLS=y
# PTXCONF_HOST_OPENSSL is not set
+# PTXCONF_HOST_PCSC_LITE is not set
# PTXCONF_HOST_RAUC is not set
# PTXCONF_HOST_SQUASHFS_TOOLS is not set
PTXCONF_HOST_SYSTEM_BC=y
# PTXCONF_HOST_U_BOOT_TOOLS is not set
# PTXCONF_HOST_UTIL_LINUX_NG is not set
-# PTXCONF_HOST_XL_TOOLS is not set
# PTXCONF_HOST_XZ is not set
# PTXCONF_HOST_ZLIB is not set
diff --git a/configs/platform-rpi/platforms/image-boot-vfat.in b/configs/platform-rpi/platforms/image-boot-vfat.in
index 6ac5dd9..1a2d6c0 100644
--- a/configs/platform-rpi/platforms/image-boot-vfat.in
+++ b/configs/platform-rpi/platforms/image-boot-vfat.in
@@ -1,4 +1,4 @@
-## SECTION=image2
+## SECTION=image
config IMAGE_BOOT_VFAT
tristate
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index ad701df..ab17bae 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# PTXdist 2018.05.0
+# PTXdist 2018.08.0
#
PTXCONF__platformconfig_MAGIC__=y
@@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v8a"
PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
PTXCONF_RUNTIME=y
PTXCONF_BUILDTIME=y
-PTXCONF_PLATFORMCONFIG_VERSION="2018.05.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2018.08.0"
#
# architecture
@@ -40,6 +40,7 @@ PTXCONF_ARCH_ARM64=y
# PTXCONF_ARCH_CRIS is not set
# PTXCONF_ARCH_PARISC is not set
# PTXCONF_ARCH_SH is not set
+# PTXCONF_ARCH_RISCV is not set
PTXCONF_ARCH_LP64=y
PTXCONF_ARCH_SUPPORTS_ENDIAN_BIG=y
PTXCONF_ARCH_SUPPORTS_ENDIAN_LITTLE=y
@@ -166,7 +167,6 @@ PTXCONF_BAREBOX_ARCH_STRING="arm"
# i.MX HAB
#
# PTXCONF_HOST_IMX_CST is not set
-# PTXCONF_U_BOOT_V2 is not set
# PTXCONF_U_BOOT is not set
#
@@ -177,41 +177,22 @@ PTXCONF_BAREBOX_ARCH_STRING="arm"
#
# image creation options
#
+# PTXCONF_IMAGE_BOOT_MLO is not set
+# PTXCONF_IMAGE_BOOT_VFAT is not set
PTXCONF_IMAGE_ESPRESSOBIN=y
-# PTXCONF_IMAGE_BOOT_MLO_VFAT is not set
-# PTXCONF_IMAGE_CPIO is not set
-# PTXCONF_IMAGE_CPIO_GZ is not set
-# PTXCONF_IMAGE_EXT2 is not set
-# PTXCONF_IMAGE_HD is not set
-# PTXCONF_IMAGE_VDI is not set
+# PTXCONF_IMAGE_HD_VDI is not set
+# PTXCONF_IMAGE_HDIMG is not set
+PTXCONF_IMAGE_KERNEL=y
#
-# ipkg options
+# Generate images/linuximage
#
-# PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY is not set
-# PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY is not set
-# PTXCONF_IMAGE_IPKG_INDEX is not set
-PTXCONF_IMAGE_XPKG_EXTRA_ARGS=""
-# PTXCONF_IMAGE_JFFS2 is not set
-PTXCONF_IMAGE_KERNEL=y
#
# 'rootfs in kernel image' is incompatible with 'install kernel into /boot'
#
PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
# PTXCONF_IMAGE_KERNEL_LZOP is not set
-# PTXCONF_IMAGE_SQUASHFS is not set
-# PTXCONF_IMAGE_TGZ is not set
-# PTXCONF_IMAGE_UBI is not set
-# PTXCONF_IMAGE_UBIFS is not set
-# PTXCONF_IMAGE_UIMAGE is not set
-
-#
-# new image creation options
-#
-# PTXCONF_IMAGE_BOOT_MLO is not set
-# PTXCONF_IMAGE_BOOT_VFAT is not set
-# PTXCONF_IMAGE_HDIMG is not set
# PTXCONF_IMAGE_RAUC is not set
# PTXCONF_IMAGE_ROOT_CPIO_GZ is not set
# PTXCONF_IMAGE_ROOT_CPIO is not set
@@ -221,9 +202,19 @@ PTXCONF_IMAGE_ROOT_EXT_SIZE="125%"
# PTXCONF_IMAGE_ROOT_EXT_EXT3 is not set
PTXCONF_IMAGE_ROOT_EXT_EXT4=y
PTXCONF_IMAGE_ROOT_EXT_TYPE="ext4"
+# PTXCONF_IMAGE_ROOT_SQUASHFS is not set
PTXCONF_IMAGE_ROOT_TGZ=y
+PTXCONF_IMAGE_ROOT_TGZ_LABEL=""
# PTXCONF_IMAGE_ROOT_UBI is not set
# PTXCONF_IMAGE_ROOT_UBIFS is not set
+
+#
+# ipkg options
+#
+# PTXCONF_IMAGE_IPKG_PUSH_TO_REPOSITORY is not set
+# PTXCONF_IMAGE_INSTALL_FROM_IPKG_REPOSITORY is not set
+# PTXCONF_IMAGE_IPKG_INDEX is not set
+PTXCONF_IMAGE_XPKG_EXTRA_ARGS=""
# PTXCONF_HOST_ACL is not set
# PTXCONF_HOST_ATTR is not set
# PTXCONF_HOST_BZIP2 is not set
@@ -255,11 +246,11 @@ PTXCONF_HOST_LZOP=y
# PTXCONF_HOST_MTD_UTILS is not set
# PTXCONF_HOST_MTOOLS is not set
# PTXCONF_HOST_OPENSSL is not set
+# PTXCONF_HOST_PCSC_LITE is not set
# PTXCONF_HOST_RAUC is not set
# PTXCONF_HOST_SQUASHFS_TOOLS is not set
PTXCONF_HOST_SYSTEM_BC=y
# PTXCONF_HOST_U_BOOT_TOOLS is not set
# PTXCONF_HOST_UTIL_LINUX_NG is not set
-# PTXCONF_HOST_XL_TOOLS is not set
# PTXCONF_HOST_XZ is not set
# PTXCONF_HOST_ZLIB is not set
--
Roland Hieber | r.hieber@pengutronix.de |
Pengutronix e.K. | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next reply other threads:[~2018-09-26 8:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-26 8:30 Roland Hieber [this message]
2018-09-26 8:51 ` Robert Schwebel
2018-09-26 9:05 ` Alexander Dahl
2018-09-26 9:08 ` Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180926083013.vuuyjaaqtz42ewcw@pengutronix.de \
--to=r.hieber@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox