DistroKit Mailinglist
 help / color / mirror / Atom feed
* [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup
@ 2019-09-19 15:20 Michael Olbrich
  2019-09-19 15:20 ` [DistroKit] [PATCH 1/5] platform-v7a: add support for Nitrogen6 MAX Michael Olbrich
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Michael Olbrich @ 2019-09-19 15:20 UTC (permalink / raw)
  To: distrokit; +Cc: Michael Olbrich

Hi,

This add support for the Nitrogen6 MAX board.
And some cleanup of the toolchain hardening options.

Michael

Michael Olbrich (5):
  platform-v7a: add support for Nitrogen6 MAX
  barebox-mx6: enable i.MX6 On Chip OTP controller
  platform-v7a: Enable C++ standard library hardening
  platform-v7a: use -fstack-protector-strong
  platform-v7a: disable -frecord-gcc-switches

 configs/platform-v7a/barebox-mx6.config       |  6 +++-
 configs/platform-v7a/barebox-mx6.config.diff  |  5 +++
 configs/platform-v7a/platformconfig           | 11 +++---
 .../platforms/blspec-nitrogen6max.in          |  5 +++
 .../loader/entries/nitrogen6max.conf          |  6 ++++
 .../rules/blspec-nitrogen6max.make            | 36 +++++++++++++++++++
 6 files changed, 63 insertions(+), 6 deletions(-)
 create mode 100644 configs/platform-v7a/platforms/blspec-nitrogen6max.in
 create mode 100644 configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
 create mode 100644 configs/platform-v7a/rules/blspec-nitrogen6max.make

-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [DistroKit] [PATCH 1/5] platform-v7a: add support for Nitrogen6 MAX
  2019-09-19 15:20 [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Michael Olbrich
@ 2019-09-19 15:20 ` Michael Olbrich
  2019-09-19 15:21 ` [DistroKit] [PATCH 2/5] barebox-mx6: enable i.MX6 On Chip OTP controller Michael Olbrich
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2019-09-19 15:20 UTC (permalink / raw)
  To: distrokit; +Cc: Michael Olbrich

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 configs/platform-v7a/platformconfig           |  3 +-
 .../platforms/blspec-nitrogen6max.in          |  5 +++
 .../loader/entries/nitrogen6max.conf          |  6 ++++
 .../rules/blspec-nitrogen6max.make            | 36 +++++++++++++++++++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 configs/platform-v7a/platforms/blspec-nitrogen6max.in
 create mode 100644 configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
 create mode 100644 configs/platform-v7a/rules/blspec-nitrogen6max.make

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index bb0d26c65e06..8119de4087f5 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -145,7 +145,7 @@ PTXCONF_KERNEL_EXTRA_MAKEVARS=""
 PTXCONF_DTC=y
 PTXCONF_DTC_INSTALL_OFTREE=y
 PTXCONF_DTC_OFTREE_DTS_PATH="${KERNEL_DIR}/arch/${PTXCONF_KERNEL_ARCH_STRING}/boot/dts"
-PTXCONF_DTC_OFTREE_DTS="am335x-bone.dts am335x-boneblack.dts vexpress-v2p-ca9.dts bcm2836-rpi-2-b.dts imx6q-sabrelite.dts imx6sx-udoo-neo-full.dts imx6dl-riotboard.dts imx6q-nitrogen6x.dts bcm2837-rpi-3-b.dts"
+PTXCONF_DTC_OFTREE_DTS="am335x-bone.dts am335x-boneblack.dts vexpress-v2p-ca9.dts bcm2836-rpi-2-b.dts imx6q-sabrelite.dts imx6sx-udoo-neo-full.dts imx6dl-riotboard.dts imx6q-nitrogen6x.dts imx6qp-nitrogen6_max.dts bcm2837-rpi-3-b.dts"
 PTXCONF_DTC_KERNEL=y
 PTXCONF_DTC_EXTRA_ARGS=""
 
@@ -194,6 +194,7 @@ PTXCONF_BLSPEC_BONEBLACK=y
 PTXCONF_BLSPEC_BONEWHITE=y
 # PTXCONF_BLSPEC_ENTRY is not set
 PTXCONF_BLSPEC_GF=y
+PTXCONF_BLSPEC_NITROGEN6MAX=y
 PTXCONF_BLSPEC_NITROGEN6X=y
 PTXCONF_BLSPEC_RIOTBOARD=y
 PTXCONF_BLSPEC_RPI2=y
diff --git a/configs/platform-v7a/platforms/blspec-nitrogen6max.in b/configs/platform-v7a/platforms/blspec-nitrogen6max.in
new file mode 100644
index 000000000000..ddeff46a0198
--- /dev/null
+++ b/configs/platform-v7a/platforms/blspec-nitrogen6max.in
@@ -0,0 +1,5 @@
+## SECTION=blspec
+
+config BLSPEC_NITROGEN6MAX
+	tristate
+	prompt "/loader/entries/nitrogen6max.conf bootloader spec entry"
diff --git a/configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf b/configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
new file mode 100644
index 000000000000..083d9b03385f
--- /dev/null
+++ b/configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
@@ -0,0 +1,6 @@
+title		Nitrogen6 MAX - Pengutronix-DistroKit
+version		5.3
+options		rootwait rw
+linux		/boot/zImage
+devicetree	/boot/imx6qp-nitrogen6_max.dtb
+linux-appendroot true
diff --git a/configs/platform-v7a/rules/blspec-nitrogen6max.make b/configs/platform-v7a/rules/blspec-nitrogen6max.make
new file mode 100644
index 000000000000..6fb646631542
--- /dev/null
+++ b/configs/platform-v7a/rules/blspec-nitrogen6max.make
@@ -0,0 +1,36 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_BLSPEC_NITROGEN6MAX) += blspec-nitrogen6max
+
+BLSPEC_NITROGEN6MAX_VERSION	:= 5.3
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/blspec-nitrogen6max.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, blspec-nitrogen6max)
+	@$(call install_fixup,blspec-nitrogen6max,PRIORITY,optional)
+	@$(call install_fixup,blspec-nitrogen6max,SECTION,base)
+	@$(call install_fixup,blspec-nitrogen6max,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
+	@$(call install_fixup,blspec-nitrogen6max,DESCRIPTION,missing)
+
+	@$(call install_alternative, blspec-nitrogen6max, 0, 0, 0644, \
+		/loader/entries/nitrogen6max.conf)
+
+	@$(call install_finish,blspec-nitrogen6max)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [DistroKit] [PATCH 2/5] barebox-mx6: enable i.MX6 On Chip OTP controller
  2019-09-19 15:20 [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Michael Olbrich
  2019-09-19 15:20 ` [DistroKit] [PATCH 1/5] platform-v7a: add support for Nitrogen6 MAX Michael Olbrich
@ 2019-09-19 15:21 ` Michael Olbrich
  2019-09-19 15:21 ` [DistroKit] [PATCH 3/5] platform-v7a: Enable C++ standard library hardening Michael Olbrich
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2019-09-19 15:21 UTC (permalink / raw)
  To: distrokit; +Cc: Michael Olbrich

Barebox needs this to read the MAC addresse of the board.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 configs/platform-v7a/barebox-mx6.config      | 6 +++++-
 configs/platform-v7a/barebox-mx6.config.diff | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 8ebb9225e506..2b69d0a03e69 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -813,7 +813,11 @@ CONFIG_PINCTRL_IMX_IOMUX_V3=y
 # CONFIG_PINCTRL_SINGLE is not set
 # end of Pin controllers
 
-# CONFIG_NVMEM is not set
+CONFIG_NVMEM=y
+# CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_IMX_OCOTP=y
+# CONFIG_IMX_OCOTP_WRITE is not set
+# CONFIG_EEPROM_93XX46 is not set
 
 #
 # Bus devices
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 8cf11cc2f3c3..680ea227a491 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -60,6 +60,7 @@ CONFIG_DRIVER_VIDEO_IMX_IPUV3_LVDS=y
 # CONFIG_DRIVER_VIDEO_MTL017 is not set
 CONFIG_DRIVER_VIDEO_SIMPLEFB=y
 # CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set
+# CONFIG_EEPROM_93XX46 is not set
 CONFIG_EEPROM_AT25=y
 # CONFIG_FRAMEBUFFER_CONSOLE is not set
 CONFIG_FS_UBIFS=y
@@ -77,6 +78,8 @@ CONFIG_IMAGE_SPARSE=y
 CONFIG_IMX_IIM=y
 CONFIG_IMX_IIM_FUSE_BLOW=y
 CONFIG_IMX_MULTI_BOARDS=y
+CONFIG_IMX_OCOTP=y
+# CONFIG_IMX_OCOTP_WRITE is not set
 # CONFIG_IMX_WEIM is not set
 CONFIG_INPUT=y
 CONFIG_KEYBOARD_GPIO=y
@@ -181,6 +184,8 @@ CONFIG_NAND_IMX_BBM=y
 CONFIG_NAND_INFO=y
 CONFIG_NAND_MXS=y
 CONFIG_NAND_READ_OOB=y
+CONFIG_NVMEM=y
+# CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_PARTITION_DISK_EFI=y
 CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y
 CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE=y
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [DistroKit] [PATCH 3/5] platform-v7a: Enable C++ standard library hardening
  2019-09-19 15:20 [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Michael Olbrich
  2019-09-19 15:20 ` [DistroKit] [PATCH 1/5] platform-v7a: add support for Nitrogen6 MAX Michael Olbrich
  2019-09-19 15:21 ` [DistroKit] [PATCH 2/5] barebox-mx6: enable i.MX6 On Chip OTP controller Michael Olbrich
@ 2019-09-19 15:21 ` Michael Olbrich
  2019-09-19 15:21 ` [DistroKit] [PATCH 4/5] platform-v7a: use -fstack-protector-strong Michael Olbrich
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2019-09-19 15:21 UTC (permalink / raw)
  To: distrokit; +Cc: Michael Olbrich

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 configs/platform-v7a/platformconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 8119de4087f5..be4e83e3736d 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -85,7 +85,7 @@ PTXCONF_TARGET_HARDEN_FORTIFY=y
 PTXCONF_TARGET_HARDEN_RELRO=y
 PTXCONF_TARGET_HARDEN_BINDNOW=y
 PTXCONF_TARGET_HARDEN_PIE=y
-# PTXCONF_TARGET_HARDEN_GLIBCXX_ASSERTIONS is not set
+PTXCONF_TARGET_HARDEN_GLIBCXX_ASSERTIONS=y
 
 #
 # extra toolchain options       
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [DistroKit] [PATCH 4/5] platform-v7a: use -fstack-protector-strong
  2019-09-19 15:20 [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Michael Olbrich
                   ` (2 preceding siblings ...)
  2019-09-19 15:21 ` [DistroKit] [PATCH 3/5] platform-v7a: Enable C++ standard library hardening Michael Olbrich
@ 2019-09-19 15:21 ` Michael Olbrich
  2019-09-19 15:21 ` [DistroKit] [PATCH 5/5] platform-v7a: disable -frecord-gcc-switches Michael Olbrich
  2019-09-20  9:08 ` [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Robert Schwebel
  5 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2019-09-19 15:21 UTC (permalink / raw)
  To: distrokit; +Cc: Michael Olbrich

It's better than -fstack-protector and has similar overhead.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 configs/platform-v7a/platformconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index be4e83e3736d..766e8414a774 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -77,8 +77,8 @@ PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}"
 # hardening options             
 #
 # PTXCONF_TARGET_HARDEN_STACK_NONE is not set
-PTXCONF_TARGET_HARDEN_STACK=y
-# PTXCONF_TARGET_HARDEN_STACK_STRONG is not set
+# PTXCONF_TARGET_HARDEN_STACK is not set
+PTXCONF_TARGET_HARDEN_STACK_STRONG=y
 # PTXCONF_TARGET_HARDEN_STACK_ALL is not set
 PTXCONF_TARGET_HARDEN_STACKCLASH=y
 PTXCONF_TARGET_HARDEN_FORTIFY=y
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [DistroKit] [PATCH 5/5] platform-v7a: disable -frecord-gcc-switches
  2019-09-19 15:20 [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Michael Olbrich
                   ` (3 preceding siblings ...)
  2019-09-19 15:21 ` [DistroKit] [PATCH 4/5] platform-v7a: use -fstack-protector-strong Michael Olbrich
@ 2019-09-19 15:21 ` Michael Olbrich
  2019-09-20  9:08 ` [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Robert Schwebel
  5 siblings, 0 replies; 7+ messages in thread
From: Michael Olbrich @ 2019-09-19 15:21 UTC (permalink / raw)
  To: distrokit; +Cc: Michael Olbrich

It breaks reproducible builds because temporary file names in the
command-line change the build-id.change the build-id.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 configs/platform-v7a/platformconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 766e8414a774..0a817eaad376 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -99,7 +99,7 @@ PTXCONF_TARGET_LINKER_AS_NEEDED=y
 PTXCONF_TARGET_DEBUG_KEEP=y
 # PTXCONF_TARGET_DEBUG_ENABLE is not set
 # PTXCONF_TARGET_DEBUG_FULL is not set
-PTXCONF_TARGET_COMPILER_RECORD_SWITCHES=y
+# PTXCONF_TARGET_COMPILER_RECORD_SWITCHES is not set
 PTXCONF_TARGET_BUILD_ID=y
 PTXCONF_TARGET_EXTRA_CPPFLAGS=""
 PTXCONF_TARGET_EXTRA_CFLAGS=""
-- 
2.20.1


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup
  2019-09-19 15:20 [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Michael Olbrich
                   ` (4 preceding siblings ...)
  2019-09-19 15:21 ` [DistroKit] [PATCH 5/5] platform-v7a: disable -frecord-gcc-switches Michael Olbrich
@ 2019-09-20  9:08 ` Robert Schwebel
  5 siblings, 0 replies; 7+ messages in thread
From: Robert Schwebel @ 2019-09-20  9:08 UTC (permalink / raw)
  To: Michael Olbrich; +Cc: distrokit

On Thu, Sep 19, 2019 at 05:20:58PM +0200, Michael Olbrich wrote:
> This add support for the Nitrogen6 MAX board.
> And some cleanup of the toolchain hardening options.

Series applied, thanks.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2019-09-20  9:08 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-19 15:20 [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Michael Olbrich
2019-09-19 15:20 ` [DistroKit] [PATCH 1/5] platform-v7a: add support for Nitrogen6 MAX Michael Olbrich
2019-09-19 15:21 ` [DistroKit] [PATCH 2/5] barebox-mx6: enable i.MX6 On Chip OTP controller Michael Olbrich
2019-09-19 15:21 ` [DistroKit] [PATCH 3/5] platform-v7a: Enable C++ standard library hardening Michael Olbrich
2019-09-19 15:21 ` [DistroKit] [PATCH 4/5] platform-v7a: use -fstack-protector-strong Michael Olbrich
2019-09-19 15:21 ` [DistroKit] [PATCH 5/5] platform-v7a: disable -frecord-gcc-switches Michael Olbrich
2019-09-20  9:08 ` [DistroKit] [PATCH 0/5] Nitrogen6 MAX support and platform cleanup Robert Schwebel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox