bosch: Add inital board support for ACC
Subsystems (3)
PATCH 1/1 bosch: Add inital board support for ACC
The Bosch ACC (Air Center Control) Board is based on the i.MX6D.
---
This board supports depends on:
- "Add pmic bootcount driver", patchwork id 287976
- "crypto/fsl: Fallback to SW sha1/256 is misaligned buffers", patchwork id 270524
--- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6q-acc-common.dtsi | 885 +++++++++++++++++++++++++++++ arch/arm/dts/imx6q-acc-u-boot.dtsi | 71 +++ arch/arm/dts/imx6q-acc.dts | 281 +++++++++ arch/arm/mach-imx/mx6/Kconfig | 15 + board/bosch/acc/Kconfig | 18 + board/bosch/acc/MAINTAINERS | 10 + board/bosch/acc/Makefile | 6 + board/bosch/acc/acc.c | 737 ++++++++++++++++++++++++ configs/imx6q_acc_defconfig | 107 ++++ include/configs/imx6q-acc.h | 165 ++++++ 11 files changed, 2296 insertions(+) create mode 100644 arch/arm/dts/imx6q-acc-common.dtsi create mode 100644 arch/arm/dts/imx6q-acc-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-acc.dts create mode 100644 board/bosch/acc/Kconfig create mode 100644 board/bosch/acc/MAINTAINERS create mode 100644 board/bosch/acc/Makefile create mode 100644 board/bosch/acc/acc.c create mode 100644 configs/imx6q_acc_defconfig create mode 100644 include/configs/imx6q-acc.h
arch/arm/dts/Makefile +1 -0
@@ -810,6 +810,7 @@ dtb-y += \ imx6q-sabreauto.dtb \ imx6q-sabrelite.dtb \ imx6q-sabresd.dtb \ + imx6q-acc.dtb \ imx6q-tbs2910.dtb \ imx6q-wandboard-revd1.dtb \ imx6qp-sabreauto.dtb \
arch/arm/dts/imx6q-acc-common.dtsi new file +885 -0
885 lines not on this page · raw message
arch/arm/dts/imx6q-acc-u-boot.dtsi new file +71 -0
71 lines not on this page · raw message
arch/arm/dts/imx6q-acc.dts new file +281 -0
281 lines not on this page · raw message
arch/arm/mach-imx/mx6/Kconfig +15 -0
@@ -345,6 +345,20 @@ config TARGET_MX6Q_ENGICAM select SUPPORT_SPL imply CMD_DM +config TARGET_MX6Q_ACC + bool "Support for Bosch ACC board" + depends on MX6QDL + select BOARD_LATE_INIT + select OF_CONTROL + select SPL_OF_LIBFDT + select DM + select DM_ETH + select DM_GPIO + select DM_I2C + select DM_MMC + select DM_THERMAL + select SUPPORT_SPL + config TARGET_MX6SABREAUTO bool "mx6sabreauto" depends on MX6QDL
@@ -674,6 +688,7 @@ source "board/freescale/mx6sxsabresd/Kconfig" source "board/freescale/mx6sxsabreauto/Kconfig" source "board/freescale/mx6ul_14x14_evk/Kconfig" source "board/freescale/mx6ullevk/Kconfig" +source "board/bosch/acc/Kconfig" source "board/grinn/liteboard/Kconfig" source "board/phytec/pcm058/Kconfig" source "board/phytec/pcl063/Kconfig"
board/bosch/acc/Kconfig new file +18 -0
@@ -0,0 +1,18 @@ +if TARGET_MX6Q_ACC + +config SYS_VENDOR + default "bosch" + +config SYS_BOARD + default "acc" + +config SYS_CONFIG_NAME + default "imx6q-acc" + +config SYS_BOOT_EMMC + bool "Boot from EMMC" + default y + help + Say N here if you want to boot from SD card or microUSB. + +endif
board/bosch/acc/MAINTAINERS new file +10 -0
@@ -0,0 +1,10 @@ +MX6Q_ACC +M: Matthias Winker <[email protected]> +M: Philip Oberfichtner <[email protected]> +S: Maintained +F: board/bosch/acc +F: include/configs/imx6q-acc.h +F: configs/imx6q_acc_defconfig +F: arch/arm/dts/imx6q-acc-common.dtsi +F: arch/arm/dts/imx6q-acc.dts +F: arch/arm/dts/imx6q-acc-u-boot.dts
board/bosch/acc/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# Copyright (C) 2017 +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y := acc.o
board/bosch/acc/acc.c new file +737 -0
737 lines not on this page · raw message
configs/imx6q_acc_defconfig new file +107 -0
107 lines not on this page · raw message
include/configs/imx6q-acc.h new file +165 -0
165 lines not on this page · raw message
Signature · 1 line
2.34.1
Hi Philipp,
Quoted 1 line · Philip Oberfichtner
The Bosch ACC (Air Center Control) Board is based on the i.MX6D.
[snip]
Quoted 88 lines
include/configs/imx6q-acc.h new file +80
-0@@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: GPL-2.0+ +* +* Copyright (c) 2017 DENX Software Engineering GmbH, Heiko Schocher <[email protected]> +* Copyright (c) 2019 Bosch Thermotechnik GmbH +*/ + +#ifndef __IMX6Q_ACC_H +#define __IMX6Q_ACC_H + +#include <linux/sizes.h> +#include "mx6_common.h" + +/* Environment settings */ +#define CONFIG_ENV_ACCESS_IGNORE_FORCE + +#ifdef CONFIG_SYS_BOOT_EMMC +#define MMC_ROOTFS_DEV 0 +#define MMC_ROOTFS_PART 2 +#endif + +/* Allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +#ifdef CONFIG_SYS_BOOT_EMMC +/* eMMC Boot */ +#define ENV_EXTRA \ + "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \ + "mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \ + "fitpart=1\0" \ + "optargs=ro quiet systemd.gpt_auto=false\0" \ + "production=1\0" \ + "mmcautodetect=yes\0" \ + "mmcrootfstype=ext4\0" \ + "finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \ + "mmcargs=run finduuid; setenv bootargs " \ + "root=PARTUUID=${uuid} ${optargs} rootfstype=${mmcrootfstype}\0" \ + "mmc_mmc_fit=run env_persist; run setbm; run mmcloadfit; " \ + "run auth_fit_or_reset; run mmcargs addcon; " \ + "bootm ${fit_addr}#${bootconf}\0" \ + "bootset=0\0" \ + "setbm=if test ${bootset} -eq 1; " \ + "then setenv mmcpart 4; setenv fitpart 3; " \ + "else; setenv mmcpart 2; setenv fitpart 1; fi\0" \ + "handle_ustate=if test ${ustate} -eq 2; then setenv ustate 3; fi\0" \ + "switch_bootset=if test ${bootset} -eq 1; then setenv bootset 0; " \ + "else; setenv bootset 1;fi\0" \ + "env_persisted=0\0" \ + "env_persist=if test ${env_persisted} != 1; " \ + "then env set env_persisted 1; run save_env; fi;\0" \ + "save_env=env save; env save\0" \ + "altbootcmd=run handle_ustate; run switch_bootset; run save_env; run bootcmd\0" + +#define CONFIG_ENV_FLAGS_LIST_STATIC \ + "addcon:so," \ + "altbootcmd:so," \ + "auth_fit_or_reset:so," \ + "baudrate:do," \ + "bootcmd:so," \ + "bootcount:da," \ + "bootdelay:do," \ + "bootlimit:do," \ + "bootset:ba," \ + "clone_pending:ba," \ + "console:so," \ + "endurance_test:ba," \ + "env_persist:so," \ + "env_persisted:ba," \ + "ethaddr:so," \ + "factory_reset:ba," \ + "fdtcontroladdr:xa," \ + "finduuid:so," \ + "fit_addr:do," \ + "fitpart:da," \ + "handle_ustate:so," \ + "loadaddr:xo," \ + "mmc_mmc_fit:so," \ + "mmcargs:so," \ + "mmcautodetect:so," \ + "mmcdev:do," \ + "mmcfit_name:so," \
include/configs/imx6q-acc.h line 90
Quoted 10 lines
include/configs/imx6q-acc.h new file +10
-0+"mmcloadfit:so," \ +"mmcpart:da," \ +"mmcrootfstype:so," \ +"optargs:so," \ +"production:ba," \ +"save_env:so," \ +"setbm:so," \ +"silent:so," \ +"switch_bootset:so," \ +"ustate:da"
This is the list of the variables that are allowed to be changed. Generally, this list is very short to avoid that an attacker can change a lot. I wonder that on this board the list is very long - sure that this is ok ?
include/configs/imx6q-acc.h line 92
Quoted 2 lines
include/configs/imx6q-acc.h new file +2
-0+ +#else //CONFIG_SYS_BOOT_EMMC
CONFIG_ are not allowed and they are rejected during build. Any CONFIG_ switch should go into Kbuild. It is not useful here, so just rename local defines in this file with something different as CONFIG_ (ENV_FLAG
Rather the CI hits the comments, too, so please drop them. Not only, there are some CONFIG_ that are already defined in Kbuild. Sure that you have to redefine all of them or you can just add them to configs/imx6q_acc_defconfig ?
You can check the error reported here:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/jobs/420785
Best regards,
Stefano
Quoted 73 lines
include/configs/imx6q-acc.h new file +73
-0+/* SD Card boot */ +#define ENV_EXTRA \ + "mmcdev=1\0" \ + "fitpart=1\0" \ + "rootpart=2\0" \ + "optargs=ro systemd.gpt_auto=false\0" \ + "finduuid=part uuid mmc ${mmcdev}:${rootpart} uuid\0" \ + "mmcargs=run finduuid;setenv bootargs root=PARTUUID=${uuid} ${optargs}\0" \ + "mmc_mmc_fit=run mmcloadfit; run auth_fit_or_reset; run mmcargs addcon; " \ + "bootm ${fit_addr}#${bootconf}\0" + +#endif //CONFIG_SYS_BOOT_EMMC + +/* Default environment */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootconf=conf-imx6q-acc.dtb\0"\ + "mmcfit_name=fitImage\0" \ + "mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr} ${mmcfit_name}\0" \ + "auth_fit_or_reset=hab_auth_img ${fit_addr} ${filesize} || reset\0" \ + "console=ttymxc0\0" \ + "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \ + "fit_addr=19000000\0" \ + ENV_EXTRA + +/* Miscellaneous configurable options */ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 5 * SZ_1M) + +/* Physical Memory Map */ +#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +/* Ethernet */ +#ifdef CONFIG_FEC_MXC +#define CONFIG_FEC_MXC_PHYADDR 0 +#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_MII +#endif + +/* SPL */ +#ifdef CONFIG_SPL +#include "imx6_spl.h" + +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_FSL_USDHC_NUM 2 + +#ifdef CONFIG_SYS_BOOT_EMMC + +/* Boot from eMMC */ +#define CONFIG_SYS_FSL_ESDHC_ADDR 1 + +#else // CONFIG_SYS_BOOT_EMMC + +/* Boot from SD-card */ +# define CONFIG_SYS_FSL_ESDHC_ADDR 0 + +#endif // CONFIG_SYS_BOOT_EMMC + +#endif // CONFIG_SPL_BUILD +#endif // CONFIG_SPL + +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CONFIG_MXC_USB_FLAGS 0 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */ + +#endif /* __IMX6Q_ACC_H */
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
Hi Stefano,
Quoted 114 lines · Stefano Babic
Hi Philipp,
Quoted 1 line · Philip Oberfichtner
The Bosch ACC (Air Center Control) Board is based on the i.MX6D.
[snip]
Quoted 96 lines
include/configs/imx6q- renamed from include/configs/imx6q-acc.h +0
-0
acc.h
new file mode 100644
index 0000000000..caa11df49finclude/configs/imx6q-acc.h new file +3
-0@@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: GPL-2.0+ +* +* Copyright (c) 2017 DENX Software Engineering GmbH, Heiko Schocher <[email protected]>
+ * Copyright (c) 2019 Bosch Thermotechnik GmbH
+ */include/configs/imx6q-acc.h new file +31
-0+ +#ifndef __IMX6Q_ACC_H +#define __IMX6Q_ACC_H + +#include <linux/sizes.h> +#include "mx6_common.h" + +/* Environment settings */ +#define CONFIG_ENV_ACCESS_IGNORE_FORCE + +#ifdef CONFIG_SYS_BOOT_EMMC +#define MMC_ROOTFS_DEV 0 +#define MMC_ROOTFS_PART 2 +#endif + +/* Allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +#ifdef CONFIG_SYS_BOOT_EMMC +/* eMMC Boot */ +#define ENV_EXTRA \ + "mmcdev=" __stringify(MMC_ROOTFS_DEV) "\0" \ + "mmcpart=" __stringify(MMC_ROOTFS_PART) "\0" \ + "fitpart=1\0" \ + "optargs=ro quiet systemd.gpt_auto=false\0" \ + "production=1\0" \ + "mmcautodetect=yes\0" \ + "mmcrootfstype=ext4\0" \ + "finduuid=part uuid mmc ${mmcdev}:${mmcpart} uuid\0" \ + "mmcargs=run finduuid; setenv bootargs " \ + "root=PARTUUID=${uuid} ${optargs}rootfstype=${mmcrootfstype}\0" \
+ "mmc_mmc_fit=runenv_persist; run setbm; run mmcloadfit; " \
+ "runauth_fit_or_reset; run mmcargs addcon; " \
+ "bootm ${fit_addr}#${bootconf}\0" \
+ "bootset=0\0" \
+ "setbm=if test ${bootset} -eq 1; " \
+ "then setenv mmcpart 4; setenv fitpart 3; " \
+ "else; setenv mmcpart 2; setenv fitpart 1; fi\0" \
+ "handle_ustate=if test ${ustate} -eq 2; then setenv ustate 3; fi\0" \
+ "switch_bootset=if test ${bootset} -eq 1; then setenv bootset 0; " \
+ "else; setenv bootset 1;fi\0" \
+ "env_persisted=0\0" \
+ "env_persist=if test ${env_persisted} != 1; " \
+ "then env setenv_persisted1; runsave_env; fi;\0" \
+ "save_env=env save; env save\0" \
+ "altbootcmd=runhandle_ustate; runswitch_bootset; runsave_env; run bootcmd\0"include/configs/imx6q-acc.h new file +29
-0+ +#define CONFIG_ENV_FLAGS_LIST_STATIC \ + "addcon:so," \ + "altbootcmd:so," \ + "auth_fit_or_reset:so," \ + "baudrate:do," \ + "bootcmd:so," \ + "bootcount:da," \ + "bootdelay:do," \ + "bootlimit:do," \ + "bootset:ba," \ + "clone_pending:ba," \ + "console:so," \ + "endurance_test:ba," \ + "env_persist:so," \ + "env_persisted:ba," \ + "ethaddr:so," \ + "factory_reset:ba," \ + "fdtcontroladdr:xa," \ + "finduuid:so," \ + "fit_addr:do," \ + "fitpart:da," \ + "handle_ustate:so," \ + "loadaddr:xo," \ + "mmc_mmc_fit:so," \ + "mmcargs:so," \ + "mmcautodetect:so," \ + "mmcdev:do," \ + "mmcfit_name:so," \include/configs/imx6q-acc.h line 90
Quoted 10 lines
include/configs/imx6q-acc.h new file +10
-0+ "mmcloadfit:so," \ + "mmcpart:da," \ + "mmcrootfstype:so," \ + "optargs:so," \ + "production:ba," \ + "save_env:so," \ + "setbm:so," \ + "silent:so," \ + "switch_bootset:so," \ + "ustate:da"
Quoted 6 lines
This is the list of the variables that are allowed to be changed. Generally, this list is very short to avoid that an attacker can change
a lot. I wonder that on this board the list is very long - sure that this is ok ?
Thanks for the hint. For V2 I will enable CONFIG_ENV_WRITEABLE_LIST and shorten this list. This will also involve a 'env_get_location' implementation in the board file.
Quoted 16 lines
include/configs/imx6q-acc.h line 92
Quoted 3 lines
include/configs/imx6q-acc.h new file +2
-0+ +#else //CONFIG_SYS_BOOT_EMMC
CONFIG_are not allowed and they are rejected during build. AnyCONFIG_
switch should go intoKbuild. It is not useful here, so just rename local defines in this file with something different asCONFIG_(ENV_FLAGRather the CI hits the comments, too, so please drop them. Not only, there are some
CONFIG_that are already defined inKbuild. Sure that you
have to redefine all of them or you can just add them to configs/imx6q_acc_defconfig ?
Quoted 3 lines
You can check the error reported here:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/jobs/420785
For V2 I will migrate CONFIG_MII and CONFIG_SYS_MEMTEST* to Kconfig, the remainder of CONFIG_* used is whitelisted.
Concerning the CONFIG_SYS_BOOT_EMMC: This is defined in board/bosch/acc/Kconfig and used to discern SD boot from eMMC boot. Is it good practice then to leave it like this?
Thanks for the feedback.
Best regards,
Philip
Quoted 90 lines
Best regards,
StefanoQuoted 83 lines
include/configs/imx6q-acc.h new file +8
-0+/* SD Card boot */ +#define ENV_EXTRA \ + "mmcdev=1\0" \ + "fitpart=1\0" \ + "rootpart=2\0" \ + "optargs=ro systemd.gpt_auto=false\0" \ + "finduuid=part uuid mmc ${mmcdev}:${rootpart} uuid\0" \ + "mmcargs=run finduuid;setenv bootargs root=PARTUUID=${uuid}${optargs}\0" \
+ "mmc_mmc_fit=run mmcloadfit; runauth_fit_or_reset; run mmcargs addcon; " \
+ "bootm ${fit_addr}#${bootconf}\0"include/configs/imx6q-acc.h new file +8
-0+ +#endif //CONFIG_SYS_BOOT_EMMC + +/* Default environment */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootconf=conf-imx6q-acc.dtb\0"\ + "mmcfit_name=fitImage\0" \ + "mmcloadfit=ext4load mmc ${mmcdev}:${fitpart} ${fit_addr}${mmcfit_name}\0" \
+ "auth_fit_or_reset=hab_auth_img ${fit_addr} ${filesize} || reset\0" \
+ "console=ttymxc0\0" \
+ "addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \
+ "fit_addr=19000000\0" \
+ ENV_EXTRAinclude/configs/imx6q-acc.h new file +48
-1+ +/* Miscellaneous configurable options */ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 5 * SZ_1M) + +/* Physical Memory Map */ +#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + +#define CONFIG_SYS_INIT_SP_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +/* Ethernet */ +#ifdef CONFIG_FEC_MXC +#define CONFIG_FEC_MXC_PHYADDR 0 +#define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_MII +#endif + +/* SPL */ +#ifdef CONFIG_SPL +#include "imx6_spl.h" + +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_FSL_USDHC_NUM 2 + +#ifdef CONFIG_SYS_BOOT_EMMC + +/* Boot from eMMC */ +#define CONFIG_SYS_FSL_ESDHC_ADDR 1 + +#else // CONFIG_SYS_BOOT_EMMC + +/* Boot from SD-card */ +# define CONFIG_SYS_FSL_ESDHC_ADDR 0 + +#endif // CONFIG_SYS_BOOT_EMMC + +#endif // CONFIG_SPL_BUILD +#endif // CONFIG_SPL + +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI |
PORT_PTS_PTW)include/configs/imx6q-acc.h new file +2
-0+#define CONFIG_MXC_USB_FLAGS 0 +#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Enabled USB controller number */
include/configs/imx6q-acc.h new file +2
-0+ +#endif /* __IMX6Q_ACC_H */