diff options
Diffstat (limited to 'arch/arm/boards')
47 files changed, 122 insertions, 204 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 35b636f0cf..23a8dbd7d0 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -96,6 +96,7 @@ obj-$(CONFIG_MACH_PM9G45) += pm9g45/ obj-$(CONFIG_MACH_QIL_A9260) += qil-a926x/ obj-$(CONFIG_MACH_QIL_A9G20) += qil-a926x/ obj-$(CONFIG_MACH_RADXA_ROCK) += radxa-rock/ +obj-$(CONFIG_MACH_PHYTEC_SOM_RK3288) += phytec-som-rk3288/ obj-$(CONFIG_MACH_REALQ7) += datamodul-edm-qmx6/ obj-$(CONFIG_MACH_RPI_COMMON) += raspberry-pi/ obj-$(CONFIG_MACH_SABRELITE) += freescale-mx6-sabrelite/ diff --git a/arch/arm/boards/afi-gf/defaultenv-gf/boot/sd b/arch/arm/boards/afi-gf/defaultenv-gf/boot/sd index dce060542a..aa94b2fa2e 100644 --- a/arch/arm/boards/afi-gf/defaultenv-gf/boot/sd +++ b/arch/arm/boards/afi-gf/defaultenv-gf/boot/sd @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - boot-menu-add-entry "$0" "kernel & rootfs on SD card" - exit -fi - global.bootm.image=/boot/uImage global.bootm.oftree=/boot/oftree #global.bootm.initrd=<path to initrd> diff --git a/arch/arm/boards/afi-gf/defaultenv-gf/init/automount b/arch/arm/boards/afi-gf/defaultenv-gf/init/automount index c67bd1ba50..560bdb7975 100644 --- a/arch/arm/boards/afi-gf/defaultenv-gf/init/automount +++ b/arch/arm/boards/afi-gf/defaultenv-gf/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth1.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/at91sam9m10ihd/env/init/automount b/arch/arm/boards/at91sam9m10ihd/env/init/automount index 5bb63ccb9e..96ffa7059a 100644 --- a/arch/arm/boards/at91sam9m10ihd/env/init/automount +++ b/arch/arm/boards/at91sam9m10ihd/env/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-001-nand b/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-001-nand index ac516d82d7..433bc888da 100644 --- a/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-001-nand +++ b/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-001-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="128k(nand0.at91bootstrap),256k(nand0.barebox)ro,128k(nand0.bareboxenv),128k(nand0.bareboxenv2),128k(nand0.oftree),1280k(nand0.free),3M(nand0.kernel),195M(nand0.rootfs),300M(nand0.userdata),-(nand0.cache)" kernelname="atmel_nand" diff --git a/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-002-m25p80 b/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-002-m25p80 index 44198c820e..5457e4e0d4 100644 --- a/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-002-m25p80 +++ b/arch/arm/boards/at91sam9m10ihd/env/init/mtdparts-002-m25p80 @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "SPI NOR partitions" - exit -fi - mtdparts="32k(m25p0.at91bootstrap)ro,256k(m25p0.barebox),128k(m25p0.bareboxenv),128k(m25p0.bareboxenv2),128k(m25p0.oftree),-(m25p0.kernel)" kernelname="m25p0" diff --git a/arch/arm/boards/at91sam9m10ihd/env/init/ps1 b/arch/arm/boards/at91sam9m10ihd/env/init/ps1 deleted file mode 100644 index a94acc14f8..0000000000 --- a/arch/arm/boards/at91sam9m10ihd/env/init/ps1 +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -/env/config - -if [ ${global.allow_color} = "true" ]; then - export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m\n# " -else - export PS1="barebox@\h:\w\n# " -fi diff --git a/arch/arm/boards/beagle/defaultenv-beagle/init/mtdparts-nand b/arch/arm/boards/beagle/defaultenv-beagle/init/mtdparts-nand index 9335bb17a3..48c1c5d9ee 100644 --- a/arch/arm/boards/beagle/defaultenv-beagle/init/mtdparts-nand +++ b/arch/arm/boards/beagle/defaultenv-beagle/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="128k(nand0.xload),256k(nand0.barebox)ro,128k(nand0.bareboxenv),128k(nand0.oftree),4M(nand0.kernel),120M(nand0.rootfs),-(nand0.data)" kernelname="omap2-nand" diff --git a/arch/arm/boards/ccxmx51/env/init/mtdparts-nand b/arch/arm/boards/ccxmx51/env/init/mtdparts-nand index 5ea35d2ef7..27ed38a888 100644 --- a/arch/arm/boards/ccxmx51/env/init/mtdparts-nand +++ b/arch/arm/boards/ccxmx51/env/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="512k(barebox)ro,256k(bareboxenv),3328k(kernel),-(root)" kernelname="mxc_nand" diff --git a/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor b/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor index 8702b4059c..39777f95f2 100644 --- a/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor +++ b/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="256k(boot),256k(env),3584k(kernel),-(root)" kernelname="physmap-flash.0" diff --git a/arch/arm/boards/crystalfontz-cfa10036/env/init/automount b/arch/arm/boards/crystalfontz-cfa10036/env/init/automount index 8fdca7cd47..6f85c27289 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/env/init/automount +++ b/arch/arm/boards/crystalfontz-cfa10036/env/init/automount @@ -1,9 +1,4 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - mkdir -p /mnt/disk0.2 automount -d /mnt/disk0.2 '[ -e /dev/disk0.2 ] && mount /dev/disk0.2 /mnt/disk0.2' diff --git a/arch/arm/boards/datamodul-edm-qmx6/env/init/automount b/arch/arm/boards/datamodul-edm-qmx6/env/init/automount index 2ce37c785a..e786b82bdb 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/env/init/automount +++ b/arch/arm/boards/datamodul-edm-qmx6/env/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/automount b/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/automount index 8cb5eaf792..71dfd95f2b 100644 --- a/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/automount +++ b/arch/arm/boards/efika-mx-smartbook/defaultenv-efikasb/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/friendlyarm-mini2440/env/init/mtdparts-nand b/arch/arm/boards/friendlyarm-mini2440/env/init/mtdparts-nand index 7271341565..b51104ad76 100644 --- a/arch/arm/boards/friendlyarm-mini2440/env/init/mtdparts-nand +++ b/arch/arm/boards/friendlyarm-mini2440/env/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="256k(nand0.barebox),128k(nand0.bareboxenv),1536k(nand0.kernel),-(nand0.root)" kernelname="nand" diff --git a/arch/arm/boards/guf-santaro/lowlevel.c b/arch/arm/boards/guf-santaro/lowlevel.c index e2b6df5839..1502bb3d38 100644 --- a/arch/arm/boards/guf-santaro/lowlevel.c +++ b/arch/arm/boards/guf-santaro/lowlevel.c @@ -3,36 +3,47 @@ #include <io.h> #include <asm/barebox-arm-head.h> #include <asm/barebox-arm.h> +#include <asm/cache.h> #include <mach/generic.h> #include <mach/imx6-regs.h> #include <debug_ll.h> +#include <console.h> +#include <mach/esdctl.h> static inline void setup_uart(void) { - void __iomem *iomuxbase = (void *)MX6_IOMUXC_BASE_ADDR; + void __iomem *iomuxbase = IOMEM(MX6_IOMUXC_BASE_ADDR); writel(0x1, iomuxbase + 0x2b0); imx6_ungate_all_peripherals(); - imx6_uart_setup_ll(); - - putc_ll('>'); + imx6_uart_setup(IOMEM(MX6_UART2_BASE_ADDR)); } extern char __dtb_imx6q_guf_santaro_start[]; -ENTRY_FUNCTION(start_imx6q_guf_santaro, r0, r1, r2) +static noinline void santaro_start(void) { - void *fdt; + pbl_set_putc(imx_uart_putc, IOMEM(MX6_UART2_BASE_ADDR)); + + pr_debug("Garz+Fricke Santaro\n"); + + imx6q_barebox_entry(__dtb_imx6q_guf_santaro_start); +} +ENTRY_FUNCTION(start_imx6q_guf_santaro, r0, r1, r2) +{ imx6_cpu_lowlevel_init(); arm_setup_stack(0x00920000 - 8); - if (IS_ENABLED(CONFIG_DEBUG_LL)) - setup_uart(); + arm_early_mmu_cache_invalidate(); + + setup_uart(); - fdt = __dtb_imx6q_guf_santaro_start - get_runtime_offset(); + relocate_to_current_adr(); + setup_c(); + barrier(); - barebox_arm_entry(0x10000000, SZ_1G, fdt); + santaro_start(); } diff --git a/arch/arm/boards/highbank/env/init/automount b/arch/arm/boards/highbank/env/init/automount index 2c283c6eed..eb5c07a739 100644 --- a/arch/arm/boards/highbank/env/init/automount +++ b/arch/arm/boards/highbank/env/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/highbank/env/init/ps1 b/arch/arm/boards/highbank/env/init/ps1 deleted file mode 100644 index a94acc14f8..0000000000 --- a/arch/arm/boards/highbank/env/init/ps1 +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -/env/config - -if [ ${global.allow_color} = "true" ]; then - export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m\n# " -else - export PS1="barebox@\h:\w\n# " -fi diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c index 1cb02e6e48..295d4757f2 100644 --- a/arch/arm/boards/highbank/init.c +++ b/arch/arm/boards/highbank/init.c @@ -77,7 +77,7 @@ static int highbank_mem_init(void) fdt = IOMEM(FIRMWARE_DTB_BASE); root = of_unflatten_dtb(fdt); - if (!root) { + if (IS_ERR(root)) { pr_warn("no dtb found at 0x1000 use default configuration\n"); fdt = NULL; goto not_found; diff --git a/arch/arm/boards/karo-tx25/env/init/mtdparts-nand b/arch/arm/boards/karo-tx25/env/init/mtdparts-nand index e2dcfab49a..0288163ad1 100644 --- a/arch/arm/boards/karo-tx25/env/init/mtdparts-nand +++ b/arch/arm/boards/karo-tx25/env/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="512k(nand0.barebox),512k(nand0.bareboxenv),4M(nand0.kernel),-(nand0.root)" kernelname="mxc_nand" diff --git a/arch/arm/boards/lubbock/env/init/mtdparts-nor b/arch/arm/boards/lubbock/env/init/mtdparts-nor index 3307596467..b5c4e32411 100644 --- a/arch/arm/boards/lubbock/env/init/mtdparts-nor +++ b/arch/arm/boards/lubbock/env/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="2048k@0(nor0.barebox)ro,256k(nor0.barebox-env),256k(nor0.barebox-logo),256k(nor0.barebox-logo2),5120k(nor0.kernel),-(nor0.root)" kernelname="application-flash" diff --git a/arch/arm/boards/mainstone/env/init/mtdparts-nor b/arch/arm/boards/mainstone/env/init/mtdparts-nor index 3307596467..b5c4e32411 100644 --- a/arch/arm/boards/mainstone/env/init/mtdparts-nor +++ b/arch/arm/boards/mainstone/env/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="2048k@0(nor0.barebox)ro,256k(nor0.barebox-env),256k(nor0.barebox-logo),256k(nor0.barebox-logo2),5120k(nor0.kernel),-(nor0.root)" kernelname="application-flash" diff --git a/arch/arm/boards/mx31moboard/env/init/mtdparts-nor b/arch/arm/boards/mx31moboard/env/init/mtdparts-nor index f09a9cc381..ab5b175c37 100644 --- a/arch/arm/boards/mx31moboard/env/init/mtdparts-nor +++ b/arch/arm/boards/mx31moboard/env/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="512k(nor0.barebox)ro,256k(nor0.bareboxenv),4M(nor0.kernel),-(nor0.root)" kernelname="physmap-flash.0" diff --git a/arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/boot/nor b/arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/boot/nor index 0d10584abc..f584307d7a 100644 --- a/arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/boot/nor +++ b/arch/arm/boards/phytec-phycore-imx27/defaultenv-pcm038/boot/nor @@ -1,9 +1,4 @@ #!/bin/sh -if [ "$1" = menu ]; then - boot-menu-add-entry "$0" "nor" - exit -fi - global.bootm.image="/dev/nor0.kernel" global.linux.bootargs.dyn.root="root=/dev/mtdblock3 ro" diff --git a/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nand b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nand index 84220b77b3..540277cdeb 100644 --- a/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nand +++ b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="512k(nand0.barebox)ro,128k(nand0.bareboxenv),4M(nand0.kernel),-(nand0.root)" kernelname="mxc_nand" diff --git a/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nor b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nor index 2ef6ead71a..940eb86c95 100644 --- a/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nor +++ b/arch/arm/boards/phytec-phycore-imx31/env/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="256k(nor0.barebox)ro,128k(nor0.bareboxenv),4M(nor0.kernel),-(nor0.root)" kernelname="physmap-flash.0" diff --git a/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nand b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nand index 8a41f62810..c7185db7f7 100644 --- a/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nand +++ b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="512k(nand0.barebox),256k(nand0.bareboxenv),4M(nand0.kernel),-(nand0.root)" kernelname="mxc_nand" diff --git a/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nor b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nor index f787f28442..09c3ba9842 100644 --- a/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nor +++ b/arch/arm/boards/phytec-phycore-imx35/env/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="512k(nor0.barebox),128k(nor0.bareboxenv),4M(nor0.kernel),-(nor0.root)" kernelname="physmap-flash.0" diff --git a/arch/arm/boards/phytec-phycore-pxa270/env/init/mtdparts-nor b/arch/arm/boards/phytec-phycore-pxa270/env/init/mtdparts-nor index e617cbaaba..4423943211 100644 --- a/arch/arm/boards/phytec-phycore-pxa270/env/init/mtdparts-nor +++ b/arch/arm/boards/phytec-phycore-pxa270/env/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="512k(nor0.barebox),256k(nor0.bareboxenv),4M(nor0.kernel),-(nor0.root)" kernelname="physmap-flash.0" diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount index a059e190e2..91ded44119 100644 --- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount index 49d99bd78d..4b223d8037 100644 --- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/phytec-som-rk3288/Makefile b/arch/arm/boards/phytec-som-rk3288/Makefile new file mode 100644 index 0000000000..6f34c9a2f2 --- /dev/null +++ b/arch/arm/boards/phytec-som-rk3288/Makefile @@ -0,0 +1,3 @@ +obj-y += board.o +lwl-y += lowlevel.o +bbenv-y += defaultenv-physom-rk3288 diff --git a/arch/arm/boards/phytec-som-rk3288/board.c b/arch/arm/boards/phytec-som-rk3288/board.c new file mode 100644 index 0000000000..8ea6c6c47c --- /dev/null +++ b/arch/arm/boards/phytec-som-rk3288/board.c @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2016 PHYTEC Messtechnik GmbH, + * Author: Wadim Egorov <w.egorov@phytec.de> + * + * Device initialization for the phyCORE-RK3288 SoM + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <common.h> +#include <init.h> +#include <envfs.h> + +static int physom_devices_init(void) +{ + if (!of_machine_is_compatible("phytec,rk3288-phycore-som")) + return 0; + + barebox_set_hostname("pcm059"); + defaultenv_append_directory(defaultenv_physom_rk3288); + + return 0; +} +device_initcall(physom_devices_init); diff --git a/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/boot/emmc b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/boot/emmc new file mode 100644 index 0000000000..731b07f604 --- /dev/null +++ b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/boot/emmc @@ -0,0 +1,6 @@ +#!/bin/sh + +global.bootm.image=/mnt/emmc/linuximage +global.bootm.oftree=/mnt/emmc/oftree + +global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rw rootwait" diff --git a/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/boot/mmc b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/boot/mmc new file mode 100644 index 0000000000..5b19dbac02 --- /dev/null +++ b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/boot/mmc @@ -0,0 +1,6 @@ +#!/bin/sh + +global.bootm.image=/mnt/sdmmc/linuximage +global.bootm.oftree=/mnt/sdmmc/oftree + +global.linux.bootargs.dyn.root="root=/dev/mmcblk1p2 rw rootwait" diff --git a/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/init/automount-mmc b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/init/automount-mmc new file mode 100644 index 0000000000..8b3f043bba --- /dev/null +++ b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/init/automount-mmc @@ -0,0 +1,7 @@ +#!/bin/sh + +mkdir -p /mnt/emmc +automount -d /mnt/emmc 'mshc0.probe=1 && [ -e /dev/mshc0.0 ] && mount /dev/mshc0.0 /mnt/emmc' + +mkdir -p /mnt/sdmmc +automount -d /mnt/sdmmc 'mshc1.probe=1 && [ -e /dev/mshc1.0 ] && mount /dev/mshc1.0 /mnt/sdmmc' diff --git a/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/nv/boot.default b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/nv/boot.default new file mode 100644 index 0000000000..b4cedfc16b --- /dev/null +++ b/arch/arm/boards/phytec-som-rk3288/defaultenv-physom-rk3288/nv/boot.default @@ -0,0 +1 @@ +emmc mmc diff --git a/arch/arm/boards/phytec-som-rk3288/lowlevel.c b/arch/arm/boards/phytec-som-rk3288/lowlevel.c new file mode 100644 index 0000000000..7804a55bcd --- /dev/null +++ b/arch/arm/boards/phytec-som-rk3288/lowlevel.c @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2016 PHYTEC Messtechnik GmbH, + * Author: Wadim Egorov <w.egorov@phytec.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <common.h> +#include <linux/sizes.h> +#include <asm/barebox-arm-head.h> +#include <asm/barebox-arm.h> +#include <mach/rk3288-regs.h> +#include <mach/grf_rk3288.h> +#include <mach/hardware.h> +#include <debug_ll.h> + +extern char __dtb_rk3288_phycore_som_start[]; + +ENTRY_FUNCTION(start_rk3288_phycore_som, r0, r1, r2) +{ + void *fdt; + arm_cpu_lowlevel_init(); + + if (IS_ENABLED(CONFIG_DEBUG_LL)) { + struct rk3288_grf * const grf = (void *)RK3288_GRF_BASE; + rk_clrsetreg(&grf->gpio4c_iomux, + GPIO4C1_MASK << GPIO4C1_SHIFT | + GPIO4C0_MASK << GPIO4C0_SHIFT, + GPIO4C1_UART0BT_SOUT << GPIO4C1_SHIFT | + GPIO4C0_UART0BT_SIN << GPIO4C0_SHIFT); + INIT_LL(); + } + + fdt = __dtb_rk3288_phycore_som_start - get_runtime_offset(); + + barebox_arm_entry(0x0, SZ_1G, fdt); +} diff --git a/arch/arm/boards/radxa-rock/board.c b/arch/arm/boards/radxa-rock/board.c index ec053f9123..d45e8a9c52 100644 --- a/arch/arm/boards/radxa-rock/board.c +++ b/arch/arm/boards/radxa-rock/board.c @@ -16,7 +16,7 @@ #include <io.h> #include <i2c/i2c.h> #include <i2c/i2c-gpio.h> -#include <mach/rockchip-regs.h> +#include <mach/rk3188-regs.h> #include <mfd/act8846.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/raspberry-pi/env/init/bootargs-base b/arch/arm/boards/raspberry-pi/env/init/bootargs-base index 4dda5501e3..416dc8a6f4 100644 --- a/arch/arm/boards/raspberry-pi/env/init/bootargs-base +++ b/arch/arm/boards/raspberry-pi/env/init/bootargs-base @@ -1,8 +1,3 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Base bootargs" - exit -fi - global.linux.bootargs.base="console=ttyAMA0,115200" diff --git a/arch/arm/boards/raspberry-pi/env/init/ps1 b/arch/arm/boards/raspberry-pi/env/init/ps1 deleted file mode 100644 index f8948466d3..0000000000 --- a/arch/arm/boards/raspberry-pi/env/init/ps1 +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ ${global.allow_color} = "true" ]; then - export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m\n# " -else - export PS1="barebox@\h:\w\n# " -fi diff --git a/arch/arm/boards/telit-evk-pro3/env/init/mtdparts-nand b/arch/arm/boards/telit-evk-pro3/env/init/mtdparts-nand index 58e859bb96..42907ae3a7 100644 --- a/arch/arm/boards/telit-evk-pro3/env/init/mtdparts-nand +++ b/arch/arm/boards/telit-evk-pro3/env/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="0xC0000(nand0.bootstrap),256k(nand0.barebox)ro,128k(nand0.bareboxenv),3M(nand0.kernel),-(nand0.rootfs)" kernelname="atmel_nand" diff --git a/arch/arm/boards/versatile/env/boot/nor b/arch/arm/boards/versatile/env/boot/nor index 3f31605c4f..f90bcc3fca 100644 --- a/arch/arm/boards/versatile/env/boot/nor +++ b/arch/arm/boards/versatile/env/boot/nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - boot-menu-add-entry "$0" "nor" - exit -fi - global.bootm.image="/dev/nor0.kernel" global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=5 rootfstype=ubifs" diff --git a/arch/arm/boards/versatile/env/boot/nor-update b/arch/arm/boards/versatile/env/boot/nor-update index 728889d20f..5799ed68d1 100644 --- a/arch/arm/boards/versatile/env/boot/nor-update +++ b/arch/arm/boards/versatile/env/boot/nor-update @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - boot-menu-add-entry "$0" "nor update" - exit -fi - global.bootm.image="/dev/nor0.update" dtb=/dev/nor0.dtb diff --git a/arch/arm/boards/versatile/env/init/automount b/arch/arm/boards/versatile/env/init/automount index 53f9196a15..d08990b53c 100644 --- a/arch/arm/boards/versatile/env/init/automount +++ b/arch/arm/boards/versatile/env/init/automount @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "Automountpoints" - exit -fi - # automount tftp server based on $eth0.serverip mkdir -p /mnt/tftp diff --git a/arch/arm/boards/versatile/env/init/mtdparts-nor b/arch/arm/boards/versatile/env/init/mtdparts-nor index 9079d482da..20c2b994cc 100644 --- a/arch/arm/boards/versatile/env/init/mtdparts-nor +++ b/arch/arm/boards/versatile/env/init/mtdparts-nor @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - mtdparts="512k(nor0.barebox)ro,512k(nor0.bareboxenv),4864k(nor0.kernel),256k(nor0.dtb),3M(nor0.update),-(nor0.root)" kernelname="physmap-flash.0" diff --git a/arch/arm/boards/versatile/env/init/ps1 b/arch/arm/boards/versatile/env/init/ps1 deleted file mode 100644 index a1d075499f..0000000000 --- a/arch/arm/boards/versatile/env/init/ps1 +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ ${global.allow_color} = "true" ]; then - export PS1="\e[1;32mbarebox@\e[1;36m\h:\w\e[0m\n# " -else - export PS1="barebox@\h:\w\n# " -fi diff --git a/arch/arm/boards/zylonite/env/init/mtdparts-nand b/arch/arm/boards/zylonite/env/init/mtdparts-nand index 9db4652c40..749318b59e 100644 --- a/arch/arm/boards/zylonite/env/init/mtdparts-nand +++ b/arch/arm/boards/zylonite/env/init/mtdparts-nand @@ -1,10 +1,5 @@ #!/bin/sh -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - mtdparts="128k@0(TIMH)ro,128k@128k(OBMI)ro,768k@256k(barebox),256k@1024k(barebox-env),12M@1280k(kernel),38016k@13568k(root)" kernelname="pxa3xx_nand-0" |