June 2016 - U-Boot

Re: [U-Boot] [PATCH 2/3] ARM: board: cm_fx6: fixup mtd partitions in the fdt
by Christopher Spinrath 23 Jun '16

23 Jun '16

Hi Igor, On 06/22/2016 06:02 PM, Igor Grinberg wrote: > Hi Christopher, > > On 06/19/2016 06:44 PM, Christopher Spinrath wrote: >> The cm-fx6 module has an on-board st,m25p compatible spi flash chip >> used for u-boot (binary & environment). Overwrite the partitions in >> the device tree by the partition table provided in the mtdparts >> environment variable, if it is set. >> >> This allows to specify a kernel independent partitioning in the >> environment and provides a convient way for the user to adapt the >> partition table. >> >> Signed-off-by: Christopher Spinrath <christopher.spinrath(a)rwth-aachen.de> >> --- >> board/compulab/cm_fx6/cm_fx6.c | 16 +++++++++++++++- >> 1 file changed, 15 insertions(+), 1 deletion(-) >> >> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c >> index 712057a..81a7ae2 100644 >> --- a/board/compulab/cm_fx6/cm_fx6.c >> +++ b/board/compulab/cm_fx6/cm_fx6.c >> @@ -12,6 +12,7 @@ >> #include <dm.h> >> #include <fsl_esdhc.h> >> #include <miiphy.h> >> +#include <mtd_node.h> >> #include <netdev.h> >> #include <errno.h> >> #include <usb.h> >> @@ -28,6 +29,7 @@ >> #include <asm/io.h> >> #include <asm/gpio.h> >> #include <dm/platform_data/serial_mxc.h> >> +#include <jffs2/load_kernel.h> > > Why is this needed? > The MTD_DEV_TYPE_NOR constant is defined in this header. I agree that it is a bit ugly but this header is used for the same purpose in other board files, too (e.g.board/pdm360ng/pdm360ng.c). >> #include "common.h" >> #include "../common/eeprom.h" >> #include "../common/common.h" >> @@ -581,6 +583,13 @@ int cm_fx6_setup_ecspi(void) { return 0; } >> >> #ifdef CONFIG_OF_BOARD_SETUP >> #define USDHC3_PATH "/soc/aips-bus@02100000/usdhc@02198000/" >> + >> +#ifdef CONFIG_FDT_FIXUP_PARTITIONS >> +struct node_info nodes[] = { >> + { "st,m25p", MTD_DEV_TYPE_NOR, }, >> +}; >> +#endif >> + >> int ft_board_setup(void *blob, bd_t *bd) >> { >> u32 baseboard_rev; >> @@ -589,6 +598,8 @@ int ft_board_setup(void *blob, bd_t *bd) >> char baseboard_name[16]; >> int err; >> >> + fdt_shrink_to_minimum(blob); /* Make room for new properties */ >> + >> /* MAC addr */ >> if (eth_getenv_enetaddr("ethaddr", enetaddr)) { >> fdt_find_and_setprop(blob, >> @@ -607,7 +618,6 @@ int ft_board_setup(void *blob, bd_t *bd) >> return 0; /* Assume not an early revision SB-FX6m baseboard */ >> >> if (!strncmp("SB-FX6m", baseboard_name, 7) && baseboard_rev <= 120) { >> - fdt_shrink_to_minimum(blob); /* Make room for new properties */ >> nodeoffset = fdt_path_offset(blob, USDHC3_PATH); >> fdt_delprop(blob, nodeoffset, "cd-gpios"); >> fdt_find_and_setprop(blob, USDHC3_PATH, "broken-cd", >> @@ -616,6 +626,10 @@ int ft_board_setup(void *blob, bd_t *bd) >> NULL, 0, 1); >> } >> >> +#ifdef CONFIG_FDT_FIXUP_PARTITIONS >> + fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); >> +#endif > > I really dislike the ifdeffery inside functions. > Care to introduce a stub for the !CONFIG_FDT_FIXUP_PARTITIONS case in > include/fdt_support.h for this one? > Sure. Is the header the correct place for this or should I add a #else case in the .c file? Cheers, Christopher >> + >> return 0; >> } >> #endif >> >

2 1

[U-Boot] [PATCHv6 1/6] armv8: fsl-layerscape: add i/d-cache enable function to enable_caches
by Zhiqiang Hou 23 Jun '16

23 Jun '16

From: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> This function assume that the d-cache and MMU has been enabled earlier, so it just created MMU table in main memory. But the assumption is not always correct, for example, the early setup is done in EL3, while enable_caches() is called when the PE has turned into another EL. Define the function mmu_setup() for fsl-layerscape to cover the weak one. Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> --- V6: - no change arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 8062106..d5bcf67 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -422,15 +422,21 @@ int arch_cpu_init(void) return 0; } +void mmu_setup(void) +{ + final_mmu_setup(); +} + /* - * This function is called from lib/board.c. - * It recreates MMU table in main memory. MMU and d-cache are enabled earlier. - * There is no need to disable d-cache for this operation. + * This function is called from common/board_r.c. + * It recreates MMU table in main memory. */ void enable_caches(void) { - final_mmu_setup(); + mmu_setup(); __asm_invalidate_tlb_all(); + icache_enable(); + dcache_enable(); } #endif -- 2.1.0.27.g96db324

4 17

[U-Boot] [PATCH] ARM: AM43xx: Align HS device variant defconfig filename
by Andreas Dannenberg 23 Jun '16

23 Jun '16

Align the name of the defconfig file for high-security (HS) device variants from the AM43xx family of SoCs with the corresponding names used for the general purpose devices. This allows for easier cross-association of those files and also provides room to grow from an HS device part number perspective. Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> Cc: Madan Srinivas <madans(a)ti.com> --- While renaming files is always a tricky thing due to possible side effects in this case there is likely virtually no user of this defconfig file yet as it is rather new and the HS devices are not widely available in the first place. Hence, go ahead and make this alignment rather sooner than later. configs/am437x_hs_evm_defconfig | 59 ----------------------------------------- configs/am43xx_hs_evm_defconfig | 59 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 configs/am437x_hs_evm_defconfig create mode 100644 configs/am43xx_hs_evm_defconfig diff --git a/configs/am437x_hs_evm_defconfig b/configs/am437x_hs_evm_defconfig deleted file mode 100644 index 4856a19..0000000 --- a/configs/am437x_hs_evm_defconfig +++ /dev/null @@ -1,59 +0,0 @@ -CONFIG_ARM=y -CONFIG_AM43XX=y -CONFIG_TI_SECURE_DEVICE=y -CONFIG_TARGET_AM43XX_EVM=y -CONFIG_DM_SERIAL=y -CONFIG_DM_GPIO=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 -# Device tree file can be same on HS evm -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" -CONFIG_SPL=y -CONFIG_ISW_ENTRY_ADDR=0x40302ae0 -CONFIG_SPL_STACK_R=y -CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" -CONFIG_SPL_LOAD_FIT=y -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am437x-gp-evm" -CONFIG_DM=y -CONFIG_DM_MMC=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SYS_NS16550=y -CONFIG_TI_QSPI=y -CONFIG_TIMER=y -CONFIG_OMAP_TIMER=y -CONFIG_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_DWC3=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_GADGET=y -CONFIG_USB_DWC3_OMAP=y -CONFIG_USB_DWC3_PHY_OMAP=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_G_DNL_MANUFACTURER="Texas Instruments" -CONFIG_G_DNL_VENDOR_NUM=0x0403 -CONFIG_G_DNL_PRODUCT_NUM=0xbd00 -CONFIG_SPL_OF_LIBFDT=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig new file mode 100644 index 0000000..4856a19 --- /dev/null +++ b/configs/am43xx_hs_evm_defconfig @@ -0,0 +1,59 @@ +CONFIG_ARM=y +CONFIG_AM43XX=y +CONFIG_TI_SECURE_DEVICE=y +CONFIG_TARGET_AM43XX_EVM=y +CONFIG_DM_SERIAL=y +CONFIG_DM_GPIO=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 +# Device tree file can be same on HS evm +CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm" +CONFIG_SPL=y +CONFIG_ISW_ENTRY_ADDR=0x40302ae0 +CONFIG_SPL_STACK_R=y +CONFIG_FIT=y +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" +CONFIG_SPL_LOAD_FIT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_ASKENV=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIST="am437x-gp-evm" +CONFIG_DM=y +CONFIG_DM_MMC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SYS_NS16550=y +CONFIG_TI_QSPI=y +CONFIG_TIMER=y +CONFIG_OMAP_TIMER=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y +CONFIG_USB_DWC3_OMAP=y +CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0403 +CONFIG_G_DNL_PRODUCT_NUM=0xbd00 +CONFIG_SPL_OF_LIBFDT=y -- 2.6.4

2 2

Re: [U-Boot] [PATCH 0/3] ARM: imx: enhance support for the cm-fx6 module
by Christopher Spinrath 22 Jun '16

22 Jun '16

Hi Igor, thanks for your review! On 06/22/2016 05:46 PM, Igor Grinberg wrote: > Hi Christopher, > > Thanks for doing this work. > > On 06/19/2016 06:44 PM, Christopher Spinrath wrote: >> Hi, >> >> this series aims at enhancing support for the cm-fx6 module. In >> particular, with respect to the upstream linux kernel. >> >> The first patch improves the default environment. It is non-functional >> but makes it more convenient to adapt certain settings. >> >> The later two patches add mtd partition support for the on-board spi >> flash chip. They pick up the discussion about specifying a default >> partitioning in the device tree from here [1]. In short: adding the >> default partitioning to the device tree was rejected by the linux/ >> device tree community during mainlining large parts of the device tree. >> It was proposed to implement the partition/mtd handling in u-boot. >> On the other hand, it was argued that the flash chip becomes some >> kind of "black-box" since there will be no partition labeling (in >> particular, with old u-boot versions). >> >> IMHO defining the mtd partitioning has the following (dis-)advantages: > > You mean defining it in U-Boot instead of upstream DT. > Yes. >> >> Advantages: >> - It is easier for the user to change the partitioning (e.g. to use >> the unsued 1MB free space). > > I know it says reserved, but that is not exactly unused... > It is intended to hold a splash screen of up to 1MB size and may be other > things (like dtb, etc.). > By the time the partitioning layout was defined, it was still unclear > what requirements of that additional space will be. > So it was called reserved to provide a kind of warning to the users as > it might be used at some point. > Good to know. So this would be a use case for this series. People can rename the last partition to e.g. uboot-splash. >> >> - The flash ship is used entirely for u-boot. > > Close, but not precise... > The spi flash chip is used for all boot purposes, so it might be beyond > U-Boot. > Ok. But still it is U-Boot (or another bootloader) that relies on the memory layout. >> So it is quite natural >> that u-boot manages it. Also, moving the partition table to it >> allows us to change the layout in future versions of u-boot (almost >> independently of the kernel - there are still non-device tree kernels). > > Please don't change the layout as it will break backwards compatibility. > Also, there is not much you can change. > I have no intention do so but users may want to change it (and now, can do so easily). For example, choose a better name for the "reserved" partition. >> >> - U-Boot becomes the single point of definition for all device tree >> kernels. Otherwise, each kernel (vendor vs. upstream + version) >> would ship its own partitioning. > > True. > >> Moreover, u-boot has to know >> something about the partitioning, too, because it has to know where >> the environment is saved. > > It does, although the env address is hardcoded, but it should not be > changed. > The reason for providing a partition for it is purely for Linux to able > to change the environment variables. > Indeed, but moving both definitions into one project reduces the risk of having conflicts and allows (advanced) users to change it by adapting only one project (e.g. another bootloader may use another partitioning). Cheers, Christopher >> >> Disadvantages: >> - Users of the upstream linux kernel have to use a recent u-boot >> version to avoid the "black box" effect. A concrete impact is >> that the update routine (described/proposed by CompuLab) does >> not work out of the box with older u-boot versions. > > True. > >> >> - Updating u-boot is something users might not want or miss to do. >> >> However, I think nowadays it is ok to demand a recent u-boot in >> combination with the upstream kernel. The cm-fx6 wouldn't be >> the first board doing so. Hence, I propose these patches here. >> >> Cheers, >> Christopher >> >> [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2016-June/434562.html >> >> >

1 0

[U-Boot] pull request: u-boot-uniphier/master (moveconfig)
by Masahiro Yamada 22 Jun '16

22 Jun '16

Hi Tom, Please pull some udpates of moveconfig.py tool. The following changes since commit 9f823615af919c6b89f0b80197f009f78299dcde: Kconfig: Add a new DISTRO_DEFAULTS Kconfig option (2016-06-20 21:30:13 -0400) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to fc2661eebe9e788aee61dcb0c9c8337cda1ae93b: tools: moveconfig: show suspicious boards with possible misconversion (2016-06-22 09:23:00 +0900) ---------------------------------------------------------------- Masahiro Yamada (5): tools: moveconfig: fix needless move for config with default 1 tools: moveconfig: change class WorkDir to class ReferenceSource tools: moveconfig: simplify source tree switching tools: moveconfig: simplify show_failed_boards() and show more info tools: moveconfig: show suspicious boards with possible misconversion tools/moveconfig.py | 130 +++++++++++++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 81 insertions(+), 49 deletions(-) -- Best Regards Masahiro Yamada

2 1

[U-Boot] Pull request: u-boot-net.git master
by Joe Hershberger 22 Jun '16

22 Jun '16

Hi Tom, The following changes since commit 9f823615af919c6b89f0b80197f009f78299dcde: Kconfig: Add a new DISTRO_DEFAULTS Kconfig option (2016-06-20 21:30:13 -0400) are available in the git repository at: git://git.denx.de/u-boot-net.git master for you to fetch changes up to 69fd0d4131c73a3b8a199a8d88fb4e5c688b58d5: NFS: Add error message when U-Boot NFS version (V2) is not supported by NFS server (2016-06-21 17:01:52 -0500) ---------------------------------------------------------------- Alexey Firago (1): net: phy: micrel: add support for KSZ886x switches in MIIM mode Guillaume GARDET (1): NFS: Add error message when U-Boot NFS version (V2) is not supported by NFS server Nathan Rossi (1): net: phy: marvell: Do not reset 88e1310 after autoneg Stephen Warren (1): net: rtl8169: fix switching between adapters drivers/net/phy/marvell.c | 5 +---- drivers/net/phy/micrel.c | 26 ++++++++++++++++++++++++++ drivers/net/rtl8169.c | 13 +++++++++---- net/nfs.c | 17 ++++++++++++++++- 4 files changed, 52 insertions(+), 9 deletions(-) Thanks! -Joe

2 1

[U-Boot] [PATCH 0/6] autoboot cleanups
by Masahiro Yamada 22 Jun '16

22 Jun '16

1/6 moves CONFIG_BOOTDELAY for a new SOCFPGA board. The rest of this series are clean-ups of autoboot code. Masahiro Yamada (6): ARM: socfpga: move CONFIG_BOOTDELAY to Kconfig for IS1 board doc: bootdelay: drop explanation about CONFIG_BOOTDELAY from README autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK autoboot: rename abortboot_{keyed,normal} to __abortboot autoboot: move CONFIG_SILENT_CONSOLE handling autoboot: move bootdelay >= 0 check to abortboot() README | 17 -------- common/Kconfig | 4 +- common/autoboot.c | 49 ++++++++-------------- configs/cairo_defconfig | 2 +- .../controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 2 +- configs/controlcenterd_TRAILBLAZER_defconfig | 2 +- configs/kwb_defconfig | 2 +- configs/omap3_evm_quick_mmc_defconfig | 2 +- configs/omap3_evm_quick_nand_defconfig | 2 +- configs/socfpga_is1_defconfig | 4 +- configs/tseries_mmc_defconfig | 2 +- configs/tseries_nand_defconfig | 2 +- configs/tseries_spi_defconfig | 2 +- doc/README.autoboot | 8 ---- include/configs/CPCI2DP.h | 1 - include/configs/CPCI4052.h | 1 - include/configs/MIP405.h | 1 - include/configs/PIP405.h | 1 - include/configs/PLU405.h | 1 - include/configs/PMC405DE.h | 1 - include/configs/PMC440.h | 1 - include/configs/VCMA9.h | 1 - include/configs/VOM405.h | 1 - include/configs/a3m071.h | 1 - include/configs/amcc-common.h | 1 - include/configs/apf27.h | 1 - include/configs/calimain.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t3517.h | 1 - include/configs/cm_t43.h | 1 - include/configs/devkit3250.h | 1 - include/configs/digsy_mtc.h | 1 - include/configs/dlvision-10g.h | 1 - include/configs/exynos-common.h | 1 - include/configs/gdppc440etx.h | 1 - include/configs/hrcon.h | 1 - include/configs/intip.h | 1 - include/configs/io.h | 1 - include/configs/io64.h | 1 - include/configs/iocon.h | 1 - include/configs/legoev3.h | 1 - include/configs/meesc.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/pcm030.h | 1 - include/configs/r7780mp.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/smdk2410.h | 1 - include/configs/smdkc100.h | 1 - include/configs/snapper9260.h | 1 - include/configs/snapper9g45.h | 1 - include/configs/socfpga_is1.h | 1 - include/configs/spear-common.h | 1 - include/configs/strider.h | 1 - include/configs/theadorable.h | 1 - include/configs/tricorder.h | 1 - include/configs/uniphier.h | 1 - include/configs/vinco.h | 1 - include/configs/work_92105.h | 1 - include/configs/x600.h | 1 - include/configs/xilinx-ppc.h | 1 - 60 files changed, 30 insertions(+), 116 deletions(-) -- 1.9.1

9 26

[U-Boot] Válasz: Továbbítás: u-boot
by krichy＠nmdps.net 22 Jun '16

22 Jun '16

Git bisect turned out this commit as first bad. I will try to revert it on master, and give it a try. Thanks, Küldve az én HTC-mről ----- Válaszüzenet ----- Feladó: "Heiko Schocher" <hs(a)denx.de> Címzett: <krichy(a)nmdps.net> Másolat: <u-boot(a)lists.denx.de> Tárgy: [U-Boot] Továbbítás: u-boot Dátum: Sze, jún. 22, 2016 08:01 Hello Richard, Am 21.06.2016 um 23:03 schrieb krichy(a)nmdps.net: > Dear Heiko, > > Sorry for being late. > > It seems that code in sunxi_gpio_set_cfgbank is causing the panic. Hmm.. I see no reason here ... can you debug into it? I have no bananapi m2, so I could not help much. you wrote: >>> I own a bananapi m2, on which u-boot does not boot up since commit >>> 90b7fc924adfe7f1745dcf6a1dabb9e77aa762a7. How did you find out, that this commit broke your hw? If this commit is the reason, can you try to revert this patch? bye, Heiko > > regards, > > 2016-06-09 06:38 időpontban Heiko Schocher ezt írta: >> Hello, >> >> Am 08.06.2016 um 21:50 schrieb krichy(a)nmdps.net: >>> Küldve az én HTC-mről >>> >>> ----- Továbbított üzenet ----- >>> Feladó: krichy(a)nmdps.net >>> Címzett: <sjoerd.simons(a)collabora.co.uk> >>> Tárgy: u-boot >>> Dátum: Sze, jún. 8, 2016 19:12 >>> >>> Dear developer, >>> >>> I own a bananapi m2, on which u-boot does not boot up since commit >>> 90b7fc924adfe7f1745dcf6a1dabb9e77aa762a7. >>> >>> The console is repeating: >>> >>> U-Boot 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34 +0200) Allwinner >>> Technology >>> >>> CPU: Allwinner A31s (SUN6I) >>> Model: Sinovoip BPI-M2 >>> DRAM: 1 GiB >>> MMC: SUNXI SD/MMC: 0 >>> *** Warning - bad CRC, using default environment >>> >>> In: serial >>> Out: serial >>> Err: serial >>> Net: data abort >>> pc : [<7ef5f6f4>] lr : [<7ef80b94>] >>> reloc pc : [<4a0016f4>] lr : [<4a022b94>] >> >> It seems its in the network init ... >> >> Do you have the System.map file for the image? Then you can >> look into it and find out, which function crashes @0x4a0016f4. >> >> bye, >> Heiko >>> sp : 7af36f80 ip : 00000000 fp : 00000017 >>> r10: 7efab5e8 r9 : 7af3dee8 r8 : 000040a0 >>> r7 : 7ef9ee0c r6 : 00000000 r5 : 00000001 r4 : 00000000 >>> r3 : 7ef80b70 r2 : 00000001 r1 : 00000000 r0 : ea00000e >>> Flags: nzCv IRQs off FIQs off Mode SVC_32 >>> Resetting CPU ... >>> >>> resetting ... >>> >>> U-Boot SPL 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34) >>> DRAM: 1024 MiB >>> Trying to boot from MMC1 >>> >>> >>> U-Boot 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34 +0200) Allwinner >>> Technology >>> >>> CPU: Allwinner A31s (SUN6I) >>> Model: Sinovoip BPI-M2 >>> DRAM: 1 GiB >>> MMC: SUNXI SD/MMC: 0 >>> *** Warning - bad CRC, using default environment >>> >>> In: serial >>> Out: serial >>> Err: serial >>> Net: data abort >>> pc : [<7ef5f6f4>] lr : [<7ef80b94>] >>> reloc pc : [<4a0016f4>] lr : [<4a022b94>] >>> sp : 7af36f80 ip : 00000000 fp : 00000017 >>> r10: 7efab5e8 r9 : 7af3dee8 r8 : 000040a0 >>> r7 : 7ef9ee0c r6 : 00000000 r5 : 00000001 r4 : 00000000 >>> r3 : 7ef80b70 r2 : 00000001 r1 : 00000000 r0 : ea00000e >>> Flags: nzCv IRQs off FIQs off Mode SVC_32 >>> Resetting CPU ... >>> >>> resetting ... >>> >>> U-Boot SPL 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34) >>> DRAM: 1024 MiB >>> Trying to boot from MMC1 >>> >>> >>> U-Boot 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34 +0200) Allwinner >>> Technology >>> >>> CPU: Allwinner A31s (SUN6I) >>> Model: Sinovoip BPI-M2 >>> DRAM: 1 GiB >>> MMC: SUNXI SD/MMC: 0 >>> *** Warning - bad CRC, using default environment >>> >>> In: serial >>> Out: serial >>> Err: serial >>> Net: data abort >>> pc : [<7ef5f6f4>] lr : [<7ef80b94>] >>> reloc pc : [<4a0016f4>] lr : [<4a022b94>] >>> sp : 7af36f80 ip : 00000000 fp : 00000017 >>> r10: 7efab5e8 r9 : 7af3dee8 r8 : 000040a0 >>> r7 : 7ef9ee0c r6 : 00000000 r5 : 00000001 r4 : 00000000 >>> r3 : 7ef80b70 r2 : 00000001 r1 : 00000000 r0 : ea00000e >>> Flags: nzCv IRQs off FIQs off Mode SVC_32 >>> >>> and so on. >>> >>> How could I help debugging, resolving this issue? >>> >>> Regards, >>> Richard Kojedzinszky >>> _______________________________________________ >>> U-Boot mailing list >>> U-Boot(a)lists.denx.de >>> http://lists.denx.de/mailman/listinfo/u-boot >>> > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] Továbbítás: u-boot
by krichy＠nmdps.net 22 Jun '16

22 Jun '16

Küldve az én HTC-mről ----- Továbbított üzenet ----- Feladó: krichy(a)nmdps.net Címzett: <sjoerd.simons(a)collabora.co.uk> Tárgy: u-boot Dátum: Sze, jún. 8, 2016 19:12 Dear developer, I own a bananapi m2, on which u-boot does not boot up since commit 90b7fc924adfe7f1745dcf6a1dabb9e77aa762a7. The console is repeating: U-Boot 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34 +0200) Allwinner Technology CPU: Allwinner A31s (SUN6I) Model: Sinovoip BPI-M2 DRAM: 1 GiB MMC: SUNXI SD/MMC: 0 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Net: data abort pc : [<7ef5f6f4>] lr : [<7ef80b94>] reloc pc : [<4a0016f4>] lr : [<4a022b94>] sp : 7af36f80 ip : 00000000 fp : 00000017 r10: 7efab5e8 r9 : 7af3dee8 r8 : 000040a0 r7 : 7ef9ee0c r6 : 00000000 r5 : 00000001 r4 : 00000000 r3 : 7ef80b70 r2 : 00000001 r1 : 00000000 r0 : ea00000e Flags: nzCv IRQs off FIQs off Mode SVC_32 Resetting CPU ... resetting ... U-Boot SPL 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34) DRAM: 1024 MiB Trying to boot from MMC1 U-Boot 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34 +0200) Allwinner Technology CPU: Allwinner A31s (SUN6I) Model: Sinovoip BPI-M2 DRAM: 1 GiB MMC: SUNXI SD/MMC: 0 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Net: data abort pc : [<7ef5f6f4>] lr : [<7ef80b94>] reloc pc : [<4a0016f4>] lr : [<4a022b94>] sp : 7af36f80 ip : 00000000 fp : 00000017 r10: 7efab5e8 r9 : 7af3dee8 r8 : 000040a0 r7 : 7ef9ee0c r6 : 00000000 r5 : 00000001 r4 : 00000000 r3 : 7ef80b70 r2 : 00000001 r1 : 00000000 r0 : ea00000e Flags: nzCv IRQs off FIQs off Mode SVC_32 Resetting CPU ... resetting ... U-Boot SPL 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34) DRAM: 1024 MiB Trying to boot from MMC1 U-Boot 2016.05-00393-g90b7fc9 (Jun 08 2016 - 18:57:34 +0200) Allwinner Technology CPU: Allwinner A31s (SUN6I) Model: Sinovoip BPI-M2 DRAM: 1 GiB MMC: SUNXI SD/MMC: 0 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Net: data abort pc : [<7ef5f6f4>] lr : [<7ef80b94>] reloc pc : [<4a0016f4>] lr : [<4a022b94>] sp : 7af36f80 ip : 00000000 fp : 00000017 r10: 7efab5e8 r9 : 7af3dee8 r8 : 000040a0 r7 : 7ef9ee0c r6 : 00000000 r5 : 00000001 r4 : 00000000 r3 : 7ef80b70 r2 : 00000001 r1 : 00000000 r0 : ea00000e Flags: nzCv IRQs off FIQs off Mode SVC_32 and so on. How could I help debugging, resolving this issue? Regards, Richard Kojedzinszky

2 3

[U-Boot] [PATCH v2] x86: Add Advantech SOM-DB5800/SOM-6867 support
by George McCollister 22 Jun '16

22 Jun '16

Add support for Advantech SOM-DB5800 with the SOM-6867 installed. This is very similar to conga-qeval20-qa3-e3845 in that there is a reference carrier board (SOM-DB5800) with a Baytrail based SoM (SOM-6867) installed. Currently supported: - 2x UART (From ITE EC on SOM-6867) routed to COM3/4 connectors on SOM-DB5800. - 4x USB 2.0 (EHCI) - Video - SATA - Ethernet - PCIe - Realtek ALC892 HD Audio Pad configuration for HDA_RSTB, HDA_SYNC, HDA_CLK, HDA_SDO HDA_SDI0 is set in DT to enable HD Audio codec. Pin defaults for codec pin complexs are not changed. Not supported: - Winbond Super I/O (Must be disabled with jumpers on SOM-DB8500) - USB 3.0 (XHCI) - TPM Signed-off-by: George McCollister <george.mccollister(a)gmail.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Disable sdio, sdcard, emmc45-ddr50 in FSP DT - Remove defines CONFIG_MMC, CONFIG_SDHCI, CONFIG_GENERIC_MMC CONFIG_MMC_SDMA from som-db5800-som-6867.h - Disable CONFIG_CMD_MMC in defconfig - Remove unused header includes from som-db5800-som-6867.c - Remove gpio-offset from function mode pinctrl definitions in DT arch/x86/Kconfig | 4 + arch/x86/dts/Makefile | 3 +- arch/x86/dts/baytrail_som-db5800-som-6867.dts | 289 +++++++++++++++++++++ board/advantech/Kconfig | 28 ++ board/advantech/som-db5800-som-6867/.gitignore | 3 + board/advantech/som-db5800-som-6867/Kconfig | 28 ++ board/advantech/som-db5800-som-6867/MAINTAINERS | 7 + board/advantech/som-db5800-som-6867/Makefile | 8 + .../som-db5800-som-6867/acpi/mainboard.asl | 11 + board/advantech/som-db5800-som-6867/dsdt.asl | 14 + .../som-db5800-som-6867/som-db5800-som-6867.c | 24 ++ board/advantech/som-db5800-som-6867/start.S | 9 + configs/som-db5800-som-6867_defconfig | 61 +++++ include/configs/som-db5800-som-6867.h | 36 +++ 14 files changed, 524 insertions(+), 1 deletion(-) create mode 100644 arch/x86/dts/baytrail_som-db5800-som-6867.dts create mode 100644 board/advantech/Kconfig create mode 100644 board/advantech/som-db5800-som-6867/.gitignore create mode 100644 board/advantech/som-db5800-som-6867/Kconfig create mode 100644 board/advantech/som-db5800-som-6867/MAINTAINERS create mode 100644 board/advantech/som-db5800-som-6867/Makefile create mode 100644 board/advantech/som-db5800-som-6867/acpi/mainboard.asl create mode 100644 board/advantech/som-db5800-som-6867/dsdt.asl create mode 100644 board/advantech/som-db5800-som-6867/som-db5800-som-6867.c create mode 100644 board/advantech/som-db5800-som-6867/start.S create mode 100644 configs/som-db5800-som-6867_defconfig create mode 100644 include/configs/som-db5800-som-6867.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 29d2307..29d1120 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -8,6 +8,9 @@ choice prompt "Mainboard vendor" default VENDOR_EMULATION +config VENDOR_ADVANTECH + bool "advantech" + config VENDOR_CONGATEC bool "congatec" @@ -29,6 +32,7 @@ config VENDOR_INTEL endchoice # board-specific options below +source "board/advantech/Kconfig" source "board/congatec/Kconfig" source "board/coreboot/Kconfig" source "board/efi/Kconfig" diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index 23156bb..4f07f41 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -14,7 +14,8 @@ dtb-y += bayleybay.dtb \ minnowmax.dtb \ qemu-x86_i440fx.dtb \ qemu-x86_q35.dtb \ - broadwell_som-6896.dtb + broadwell_som-6896.dtb \ + baytrail_som-db5800-som-6867.dtb targets += $(dtb-y) diff --git a/arch/x86/dts/baytrail_som-db5800-som-6867.dts b/arch/x86/dts/baytrail_som-db5800-som-6867.dts new file mode 100644 index 0000000..64e2e52 --- /dev/null +++ b/arch/x86/dts/baytrail_som-db5800-som-6867.dts @@ -0,0 +1,289 @@ +/* + * Copyright (C) 2014, Bin Meng <bmeng.cn(a)gmail.com> + * Copyright (C) 2016, George McCollister <george.mccollister(a)gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; + +#include <dt-bindings/gpio/x86-gpio.h> +#include <dt-bindings/interrupt-router/intel-irq.h> + +/include/ "skeleton.dtsi" +/include/ "serial.dtsi" +/include/ "rtc.dtsi" +/include/ "tsc_timer.dtsi" + +/ { + model = "Advantech SOM-DB5800-SOM-6867"; + compatible = "advantech,som-db5800-som-6867", "intel,baytrail"; + + aliases { + serial0 = &serial; + spi0 = &spi; + }; + + config { + silent_console = <0>; + }; + + pch_pinctrl { + compatible = "intel,x86-pinctrl"; + reg = <0 0>; + + /* HDA_RSTB */ + soc_gpio_s0_8@0 { + pad-offset = <0x220>; + mode-func = <2>; + }; + + /* HDA_SYNC */ + soc_gpio_s0_9@0 { + pad-offset = <0x250>; + mode-func = <2>; + pull-assign = <1>; + }; + + /* HDA_CLK */ + soc_gpio_s0_10@0 { + pad-offset = <0x240>; + mode-func = <2>; + }; + + /* HDA_SDO */ + soc_gpio_s0_11@0 { + pad-offset = <0x260>; + mode-func = <2>; + pull-assign = <1>; + }; + + /* HDA_SDI0 */ + soc_gpio_s0_12@0 { + pad-offset = <0x270>; + mode-func = <2>; + }; + }; + + chosen { + stdout-path = "/serial"; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "intel,baytrail-cpu"; + reg = <0>; + intel,apic-id = <0>; + }; + + cpu@1 { + device_type = "cpu"; + compatible = "intel,baytrail-cpu"; + reg = <1>; + intel,apic-id = <2>; + }; + + cpu@2 { + device_type = "cpu"; + compatible = "intel,baytrail-cpu"; + reg = <2>; + intel,apic-id = <4>; + }; + + cpu@3 { + device_type = "cpu"; + compatible = "intel,baytrail-cpu"; + reg = <3>; + intel,apic-id = <6>; + }; + + }; + + pci { + compatible = "intel,pci-baytrail", "pci-x86"; + #address-cells = <3>; + #size-cells = <2>; + u-boot,dm-pre-reloc; + ranges = <0x02000000 0x0 0x80000000 0x80000000 0 0x40000000 + 0x42000000 0x0 0xc0000000 0xc0000000 0 0x20000000 + 0x01000000 0x0 0x2000 0x2000 0 0xe000>; + + pch@1f,0 { + reg = <0x0000f800 0 0 0 0>; + compatible = "pci8086,0f1c", "intel,pch9"; + #address-cells = <1>; + #size-cells = <1>; + + irq-router { + compatible = "intel,irq-router"; + intel,pirq-config = "ibase"; + intel,ibase-offset = <0x50>; + intel,actl-addr = <0>; + intel,pirq-link = <8 8>; + intel,pirq-mask = <0xdee0>; + intel,pirq-routing = < + /* BayTrail PCI devices */ + PCI_BDF(0, 2, 0) INTA PIRQA + PCI_BDF(0, 3, 0) INTA PIRQA + PCI_BDF(0, 16, 0) INTA PIRQA + PCI_BDF(0, 17, 0) INTA PIRQA + PCI_BDF(0, 18, 0) INTA PIRQA + PCI_BDF(0, 19, 0) INTA PIRQA + PCI_BDF(0, 20, 0) INTA PIRQA + PCI_BDF(0, 21, 0) INTA PIRQA + PCI_BDF(0, 22, 0) INTA PIRQA + PCI_BDF(0, 23, 0) INTA PIRQA + PCI_BDF(0, 24, 0) INTA PIRQA + PCI_BDF(0, 24, 1) INTC PIRQC + PCI_BDF(0, 24, 2) INTD PIRQD + PCI_BDF(0, 24, 3) INTB PIRQB + PCI_BDF(0, 24, 4) INTA PIRQA + PCI_BDF(0, 24, 5) INTC PIRQC + PCI_BDF(0, 24, 6) INTD PIRQD + PCI_BDF(0, 24, 7) INTB PIRQB + PCI_BDF(0, 26, 0) INTA PIRQA + PCI_BDF(0, 27, 0) INTA PIRQA + PCI_BDF(0, 28, 0) INTA PIRQA + PCI_BDF(0, 28, 1) INTB PIRQB + PCI_BDF(0, 28, 2) INTC PIRQC + PCI_BDF(0, 28, 3) INTD PIRQD + PCI_BDF(0, 29, 0) INTA PIRQA + PCI_BDF(0, 30, 0) INTA PIRQA + PCI_BDF(0, 30, 1) INTD PIRQD + PCI_BDF(0, 30, 2) INTB PIRQB + PCI_BDF(0, 30, 3) INTC PIRQC + PCI_BDF(0, 30, 4) INTD PIRQD + PCI_BDF(0, 30, 5) INTB PIRQB + PCI_BDF(0, 31, 3) INTB PIRQB + + /* + * PCIe root ports downstream + * interrupts + */ + PCI_BDF(1, 0, 0) INTA PIRQA + PCI_BDF(1, 0, 0) INTB PIRQB + PCI_BDF(1, 0, 0) INTC PIRQC + PCI_BDF(1, 0, 0) INTD PIRQD + PCI_BDF(2, 0, 0) INTA PIRQB + PCI_BDF(2, 0, 0) INTB PIRQC + PCI_BDF(2, 0, 0) INTC PIRQD + PCI_BDF(2, 0, 0) INTD PIRQA + PCI_BDF(3, 0, 0) INTA PIRQC + PCI_BDF(3, 0, 0) INTB PIRQD + PCI_BDF(3, 0, 0) INTC PIRQA + PCI_BDF(3, 0, 0) INTD PIRQB + PCI_BDF(4, 0, 0) INTA PIRQD + PCI_BDF(4, 0, 0) INTB PIRQA + PCI_BDF(4, 0, 0) INTC PIRQB + PCI_BDF(4, 0, 0) INTD PIRQC + >; + }; + + spi: spi { + #address-cells = <1>; + #size-cells = <0>; + compatible = "intel,ich9-spi"; + spi-flash@0 { + #address-cells = <1>; + #size-cells = <1>; + reg = <0>; + compatible = "macronix,mx25l6405d", + "spi-flash"; + memory-map = <0xff800000 0x00800000>; + rw-mrc-cache { + label = "rw-mrc-cache"; + reg = <0x006f0000 0x00010000>; + }; + }; + }; + + gpioa { + compatible = "intel,ich6-gpio"; + u-boot,dm-pre-reloc; + reg = <0 0x20>; + bank-name = "A"; + }; + + gpiob { + compatible = "intel,ich6-gpio"; + u-boot,dm-pre-reloc; + reg = <0x20 0x20>; + bank-name = "B"; + }; + + gpioc { + compatible = "intel,ich6-gpio"; + u-boot,dm-pre-reloc; + reg = <0x40 0x20>; + bank-name = "C"; + }; + + gpiod { + compatible = "intel,ich6-gpio"; + u-boot,dm-pre-reloc; + reg = <0x60 0x20>; + bank-name = "D"; + }; + + gpioe { + compatible = "intel,ich6-gpio"; + u-boot,dm-pre-reloc; + reg = <0x80 0x20>; + bank-name = "E"; + }; + + gpiof { + compatible = "intel,ich6-gpio"; + u-boot,dm-pre-reloc; + reg = <0xA0 0x20>; + bank-name = "F"; + }; + }; + }; + + fsp { + compatible = "intel,baytrail-fsp"; + fsp,mrc-init-tseg-size = <0>; + fsp,mrc-init-mmio-size = <0x800>; + fsp,mrc-init-spd-addr1 = <0xa0>; + fsp,mrc-init-spd-addr2 = <0xa2>; + fsp,enable-spi; + fsp,enable-sata; + fsp,sata-mode = <1>; + fsp,enable-azalia; + fsp,lpss-sio-enable-pci-mode; + fsp,enable-dma0; + fsp,enable-dma1; + fsp,enable-i2c0; + fsp,enable-i2c1; + fsp,enable-i2c2; + fsp,enable-i2c3; + fsp,enable-i2c4; + fsp,enable-i2c5; + fsp,enable-i2c6; + fsp,enable-pwm0; + fsp,enable-pwm1; + fsp,igd-dvmt50-pre-alloc = <2>; + fsp,aperture-size = <2>; + fsp,gtt-size = <2>; + fsp,scc-enable-pci-mode; + fsp,os-selection = <4>; + fsp,enable-igd; + fsp,serial-debug-port-address = <0x3f8>; + fsp,serial-debug-port-type = <1>; + }; + + microcode { + update@0 { +#include "microcode/m0130673325.dtsi" + }; + update@1 { +#include "microcode/m0130679907.dtsi" + }; + }; + +}; diff --git a/board/advantech/Kconfig b/board/advantech/Kconfig new file mode 100644 index 0000000..a8d4969 --- /dev/null +++ b/board/advantech/Kconfig @@ -0,0 +1,28 @@ +if VENDOR_ADVANTECH + +choice + prompt "Mainboard model" + optional + +config TARGET_SOM_DB5800_SOM_6867 + bool "Advantech SOM-DB5800 & SOM-6867" + help + Advantech SOM-DB5800 COM Express development board with SOM-6867 + installed. + + SOM-6867 is a COM Express Type 6 Compact Module with either an Intel + Atom E3845 or Celeron N2920 processor. + + SOM-DB5800 is a COM Express Development board with: + 10/100/1000 Ethernet + PCIe slots + 4x USB ports + HDMI/DisplayPort/DVI, LVDS, VGA + SATA ports + ALC892 HD Audio Codec + +endchoice + +source "board/advantech/som-db5800-som-6867/Kconfig" + +endif diff --git a/board/advantech/som-db5800-som-6867/.gitignore b/board/advantech/som-db5800-som-6867/.gitignore new file mode 100644 index 0000000..6eb8a54 --- /dev/null +++ b/board/advantech/som-db5800-som-6867/.gitignore @@ -0,0 +1,3 @@ +dsdt.aml +dsdt.asl.tmp +dsdt.c diff --git a/board/advantech/som-db5800-som-6867/Kconfig b/board/advantech/som-db5800-som-6867/Kconfig new file mode 100644 index 0000000..f6f3748 --- /dev/null +++ b/board/advantech/som-db5800-som-6867/Kconfig @@ -0,0 +1,28 @@ +if TARGET_SOM_DB5800_SOM_6867 + +config SYS_BOARD + default "som-db5800-som-6867" + +config SYS_VENDOR + default "advantech" + +config SYS_SOC + default "baytrail" + +config SYS_CONFIG_NAME + default "som-db5800-som-6867" + +config SYS_TEXT_BASE + default 0xfff00000 if !EFI_STUB + default 0x01110000 if EFI_STUB + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y + select X86_RESET_VECTOR if !EFI_STUB + select INTEL_BAYTRAIL + select BOARD_ROMSIZE_KB_8192 + +config PCIE_ECAM_BASE + default 0xe0000000 + +endif diff --git a/board/advantech/som-db5800-som-6867/MAINTAINERS b/board/advantech/som-db5800-som-6867/MAINTAINERS new file mode 100644 index 0000000..92989bf --- /dev/null +++ b/board/advantech/som-db5800-som-6867/MAINTAINERS @@ -0,0 +1,7 @@ +Advantech SOM-DB5800-SOM-6867 +M: George McCollister <george.mccollister(a)gmail.com> +S: Maintained +F: board/advantech/som-db5800-som-6867 +F: include/configs/som-db5800-som-6867.h +F: configs/som-db5800-som-6867_defconfig +F: arch/x86/dts/baytrail_som-db5800-som-6867.dts diff --git a/board/advantech/som-db5800-som-6867/Makefile b/board/advantech/som-db5800-som-6867/Makefile new file mode 100644 index 0000000..9837aa0 --- /dev/null +++ b/board/advantech/som-db5800-som-6867/Makefile @@ -0,0 +1,8 @@ +# +# Copyright (C) 2015, Google, Inc +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += som-db5800-som-6867.o start.o +obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o diff --git a/board/advantech/som-db5800-som-6867/acpi/mainboard.asl b/board/advantech/som-db5800-som-6867/acpi/mainboard.asl new file mode 100644 index 0000000..21785ea --- /dev/null +++ b/board/advantech/som-db5800-som-6867/acpi/mainboard.asl @@ -0,0 +1,11 @@ +/* + * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* Power Button */ +Device (PWRB) +{ + Name(_HID, EISAID("PNP0C0C")) +} diff --git a/board/advantech/som-db5800-som-6867/dsdt.asl b/board/advantech/som-db5800-som-6867/dsdt.asl new file mode 100644 index 0000000..6042011 --- /dev/null +++ b/board/advantech/som-db5800-som-6867/dsdt.asl @@ -0,0 +1,14 @@ +/* + * Copyright (C) 2016, Bin Meng <bmeng.cn(a)gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +DefinitionBlock("dsdt.aml", "DSDT", 2, "U-BOOT", "U-BOOTBL", 0x00010000) +{ + /* platform specific */ + #include <asm/arch/acpi/platform.asl> + + /* board specific */ + #include "acpi/mainboard.asl" +} diff --git a/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c new file mode 100644 index 0000000..5bed2c1 --- /dev/null +++ b/board/advantech/som-db5800-som-6867/som-db5800-som-6867.c @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2016 Stefan Roese <sr(a)denx.de> + * Copyright (C) 2016 George McCollister <george.mccollister(a)gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> + +int board_early_init_f(void) +{ + /* + * The FSP enables the BayTrail internal legacy UART (again). + * Disable it again, so that the one on the EC can be used. + */ + setup_internal_uart(0); + + return 0; +} + +int arch_early_init_r(void) +{ + return 0; +} diff --git a/board/advantech/som-db5800-som-6867/start.S b/board/advantech/som-db5800-som-6867/start.S new file mode 100644 index 0000000..2c941a4 --- /dev/null +++ b/board/advantech/som-db5800-som-6867/start.S @@ -0,0 +1,9 @@ +/* + * Copyright (C) 2015, Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +.globl early_board_init +early_board_init: + jmp early_board_init_ret diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig new file mode 100644 index 0000000..30e093b --- /dev/null +++ b/configs/som-db5800-som-6867_defconfig @@ -0,0 +1,61 @@ +CONFIG_X86=y +CONFIG_VENDOR_ADVANTECH=y +CONFIG_DEFAULT_DEVICE_TREE="baytrail_som-db5800-som-6867" +CONFIG_TARGET_SOM_DB5800_SOM_6867=y +CONFIG_HAVE_INTEL_ME=y +CONFIG_ENABLE_MRC_CACHE=y +CONFIG_SMP=y +CONFIG_HAVE_VGA_BIOS=y +CONFIG_GENERATE_PIRQ_TABLE=y +CONFIG_GENERATE_MP_TABLE=y +CONFIG_GENERATE_ACPI_TABLE=y +CONFIG_SEABIOS=y +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y +CONFIG_BOOTSTAGE=y +CONFIG_BOOTSTAGE_REPORT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_CPU=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_MMC is not set +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_NFS is not set +CONFIG_CMD_PING=y +CONFIG_CMD_TIME=y +CONFIG_CMD_BOOTSTAGE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y +CONFIG_CPU=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_DM_ETH=y +CONFIG_E1000=y +CONFIG_DM_PCI=y +CONFIG_DM_RTC=y +CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_BASE=0x3f8 +CONFIG_DEBUG_UART_CLOCK=1843200 +CONFIG_SYS_NS16550=y +CONFIG_ICH_SPI=y +CONFIG_TIMER=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_VIDEO_VESA=y +CONFIG_FRAMEBUFFER_SET_VESA_MODE=y +CONFIG_FRAMEBUFFER_VESA_MODE_11A=y +CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/include/configs/som-db5800-som-6867.h b/include/configs/som-db5800-som-6867.h new file mode 100644 index 0000000..a4b343e --- /dev/null +++ b/include/configs/som-db5800-som-6867.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2015 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* + * board/config.h - configuration options, board specific + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/x86-common.h> + +#define CONFIG_SYS_MONITOR_LEN (1 << 20) +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_ARCH_EARLY_INIT_R +#define CONFIG_ARCH_MISC_INIT + +#define CONFIG_PCI_PNP +#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd,vga\0" \ + "stdout=serial,vga\0" \ + "stderr=serial,vga\0" + +#define CONFIG_SCSI_DEV_LIST \ + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} + +#define VIDEO_IO_OFFSET 0 +#define CONFIG_X86EMU_RAW_IO + +#define CONFIG_ENV_SECT_SIZE 0x1000 +#define CONFIG_ENV_OFFSET 0x006ef000 + +#endif /* __CONFIG_H */ -- 2.8.0

2 2