.gitlab-ci.yml

+image: debian:bullseye-slim
+
+build:
+  script: |
+    apt-get update
+    apt-get --yes install --no-install-recommends gcc-aarch64-linux-gnu build-essential bison flex device-tree-compiler git
+    cp mntreform-config .config
+    ./build.sh
+    if git describe >/dev/null 2>&1; then
+      grep --quiet --fixed-strings "EXTRAVERSION = \\ MNT\\ Reform\\ $(git describe --always --tags --abbrev=0)" Makefile
+    fi
+    mv flash.bin imx8mq-mnt-reform2-flash.bin
+    cp imx8mq-mnt-reform2-flash.bin imx8mq-mnt-reform2-hdmi-flash.bin
+  artifacts:
+    paths:
+      - "imx8mq-mnt-reform2-flash.bin"
+      - "imx8mq-mnt-reform2-hdmi-flash.bin"

Makefile

@@ -3,7 +3,7 @@
 VERSION = 2018
 PATCHLEVEL = 07
 SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = \ MNT\ Reform\ 2024-07-19
 NAME =
 
 # *DOCUMENTATION*
@@ -607,14 +607,18 @@ endif
 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
 KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks)
 
-# change __FILE__ to the relative path from the srctree
-KBUILD_CFLAGS	+= $(call cc-option,-fmacro-prefix-map=$(srctree)/=)
+# change __FILE__ and debugging symbols to the relative path from the
+# srctree
+KBUILD_CFLAGS	+= $(call cc-option,-ffile-prefix-map=$(srctree)/=)
 
 KBUILD_CFLAGS	+= -g
 # $(KBUILD_AFLAGS) sets -g, which causes gcc to pass a suitable -g<format>
 # option to the assembler.
 KBUILD_AFLAGS	+= -g
 
+# Use relative paths in debugging symbols
+KBUILD_AFLAGS   += --debug-prefix-map=$(srctree)/=
+
 # Report stack usage if supported
 # ARC tools based on GCC 7.1 has an issue with stack usage
 # with naked functions, see commit message for more details

arch/arm/dts/imx8mq-nitrogen8m_som.dts

@@ -310,13 +310,6 @@
 		>;
 	};
 
-	pinctrl_reg_wlan_vmmc: reg-wlan-vmmcgrp {
-		fsl,pins = <
-#define GP_REG_WLAN_VMMC	<&gpio3 20 GPIO_ACTIVE_HIGH>
-			MX8MQ_IOMUXC_SAI5_RXC_GPIO3_IO20		0x16
-		>;
-	};
-
 	pinctrl_sai1: sai1grp {
 		fsl,pins = <
 			/* wm8960 */
@@ -406,12 +399,6 @@
 			MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5		0xc3
 			MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6		0xc3
 			MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7		0xc3
-#if 0
-			MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B		0xc1
-#else
-#define GP_EMMC_RESET		<&gpio2 10 GPIO_ACTIVE_LOW>
-			MX8MQ_IOMUXC_SD1_RESET_B_GPIO2_IO10		0x41
-#endif
 		>;
 	};
 
@@ -445,6 +432,7 @@
 		>;
 	};
 
+
 	pinctrl_usdhc2: usdhc2grp {
 		fsl,pins = <
 			MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK			0x03
@@ -453,8 +441,6 @@
 			MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1		0xc3
 			MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2		0xc3
 			MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3		0xc3
-			/* Bluetooth slow clock */
-			MX8MQ_IOMUXC_GPIO1_IO00_ANAMIX_REF_CLK_32K	0x03
 		>;
 	};
 
@@ -603,18 +589,6 @@
 		regulator-max-microvolt = <5000000>;
 	};
 
-	reg_wlan_vmmc: regulator-wlan-vmmc {
-		compatible = "regulator-fixed";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_reg_wlan_vmmc>;
-		regulator-name = "reg_wlan_vmmc";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		gpio = GP_REG_WLAN_VMMC;
-		startup-delay-us = <70000>;
-		enable-active-high;
-	};
-
 #if 0
 	sound-wm8960 {
 		compatible = "fsl,imx-audio-wm8960";
@@ -1332,8 +1306,8 @@
 &usdhc1 {
 	cap-mmc-highspeed;
 	bus-width = <8>;
-	mmc-ddr-1_8v;
-	mmc-hs200-1_8v;
+	// mmc-ddr-1_8v;
+	// mmc-hs200-1_8v;
 	fsl,strobe-dll-delay-target = <5>;
 	fsl,tuning-start-tap = <63>;
 	fsl,tuning-step = <2>;
@@ -1348,7 +1322,6 @@
 	vqmmc-1-8-v;
 };
 
-#if 0
 &usdhc2 {
 	bus-width = <4>;
 	fsl,tuning-start-tap = <70>;
@@ -1362,15 +1335,9 @@
 	status = "okay";
 	tuning-delay = <32>;
 	tuning-mode = <1>;
-	vmmc-supply = <&reg_wlan_vmmc>;
-	vqmmc-1-8-v;
+	vmmc-supply = <&reg_vref_3v3>;
 };
 
-&vpu {
-	regulator-supply = <&reg_vref_0v9>;
-	status = "okay";
-};
-#endif
 
 &wdog1 {
 	pinctrl-names = "default";

arch/arm/mach-imx/imx8m/imximage.cfg

@@ -7,9 +7,7 @@
 
 FIT
 BOOT_FROM	sd
-#ifdef CONFIG_IMX8MQ
 SIGNED_HDMI	signed_hdmi_imx8m.bin
-#endif
 LOADER		spl/u-boot-spl-ddr.bin	0x7E1000
 SECOND_LOADER	u-boot.itb		0x40200000 0x60000
 

board/boundary/nitrogen8m_som/Kconfig

@@ -9,6 +9,18 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "nitrogen8m_som"
 
+config DDR_RANK_BITS
+	int "ddr rank bits"
+        default 1
+
+config DDR_CHANNEL_CNT
+	int "ddr channel cnt"
+        default 2
+
+config DDR_DRIVE_STRENGTH
+	int "ddr drive strength"
+	default 6
+
 source "board/boundary/common/Kconfig"
 
 endif

board/boundary/nitrogen8m_som/Makefile

@@ -4,9 +4,9 @@
 # SPDX-License-Identifier:      GPL-2.0+
 #
 
-obj-y += nitrogen8m_som.o mmc.o
+obj-y += nitrogen8m_som.o mmc.o lcdif.o
 
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o
-obj-y += lpddr4_timing.o
+obj-y += lpddr4_timing_8mq.o
 endif

board/boundary/nitrogen8m_som/lpddr4_timing_ch2.h

+/*
+ * Copyright Boundary Devices
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+#include <config.h>
+#include <linux/kernel.h>
+#include <asm/arch/ddr.h>
+#include <asm/arch/lpddr4_define.h>
+#include <asm/arch/imx8m_ddr.h>
+
+#ifdef WR_POST_EXT_3200
+#define CH2_VAL_INIT4	((LPDDR4_MR3 << 16) | 0x00020008)
+#else
+#define CH2_VAL_INIT4	((LPDDR4_MR3 << 16) | 8)
+#endif
+
+#if CONFIG_DDR_MB == 1024
+	/* Address map is from MSB 28: r14, r13-r0, b2-b0, c9-c0 */
+#define CH2_VAL_DDRC_ADDRMAP0_R0	0x0000001F
+#define CH2_VAL_DDRC_ADDRMAP6_R0	0x0F070707
+
+#elif CONFIG_DDR_MB == 2048
+	/* Address map is from MSB 28: r15, r14, r13-r0, b2-b0, c9-c0 */
+#define CH2_VAL_DDRC_ADDRMAP0_R0	0x0000001F
+#define CH2_VAL_DDRC_ADDRMAP6_R0	0x07070707
+	/* Address map is from MSB 28: cs, r14, r13-r0, b2-b0, c9-c0 */
+#define CH2_VAL_DDRC_ADDRMAP0_R1	0x00000016
+#define CH2_VAL_DDRC_ADDRMAP6_R1	0x0F070707
+
+#elif CONFIG_DDR_MB == 3072
+	/* Address map is from MSB 29: r15, r14, cs, r13-r0, b2-b0, c9-c0 */
+#define CH2_VAL_DDRC_ADDRMAP0_R1	0x00000015
+#define CH2_VAL_DDRC_ADDRMAP6_R1	0x48080707
+
+#elif CONFIG_DDR_MB == 4096
+	/* Address map is from MSB 29: cs, r15, r14, r13-r0, b2-b0, c9-c0 */
+#define CH2_VAL_DDRC_ADDRMAP0_R1	0x00000017
+#define CH2_VAL_DDRC_ADDRMAP6_R1	0x07070707
+#elif CONFIG_DDR_MB == 8192
+	/* Address map is from MSB 29: cs, r15, r14, r13-r0, b2-b0, c9-c0 */
+#define CH2_VAL_DDRC_ADDRMAP0_R1	0x00000018
+#define CH2_VAL_DDRC_ADDRMAP6_R1	0x07070707
+#else
+#error unsupported memory size
+#endif
+
+#define LPDDR4_CS_R0	0x1	/* 0 rank bits, 1 chip select */
+#define LPDDR4_CS_R1	0x3	/* 1 rank bit, 2 chip selects */
+
+#if (CONFIG_DDR_RANK_BITS == 0) || !defined(CH2_VAL_DDRC_ADDRMAP0_R1)
+#ifdef CH2_VAL_DDRC_ADDRMAP0_R0
+#define CH2_LPDDR4_CS			LPDDR4_CS_R0
+#define CH2_VAL_DDRC_ADDRMAP0		CH2_VAL_DDRC_ADDRMAP0_R0
+#define CH2_VAL_DDRC_ADDRMAP6		CH2_VAL_DDRC_ADDRMAP6_R0
+#else
+#error unsupported memory rank/size
+#endif
+/*
+ * rank0 will succeed, even if really rank 1, so we need
+ * to probe memory if rank0 succeeds
+ */
+#if defined(CH2_VAL_DDRC_ADDRMAP0_R0) && defined(CH2_VAL_DDRC_ADDRMAP0_R1)
+#define CH2_LPDDR4_CS_NEW		LPDDR4_CS_R1
+#define CH2_VAL_DDRC_ADDRMAP0_NEW	CH2_VAL_DDRC_ADDRMAP0_R1
+#define CH2_VAL_DDRC_ADDRMAP6_NEW	CH2_VAL_DDRC_ADDRMAP6_R1
+#endif
+
+#elif (CONFIG_DDR_RANK_BITS == 1) || !defined(CH2_VAL_DDRC_ADDRMAP0_R0)
+#ifdef CH2_VAL_DDRC_ADDRMAP0_R1
+#define CH2_LPDDR4_CS			LPDDR4_CS_R1
+#define CH2_VAL_DDRC_ADDRMAP0		CH2_VAL_DDRC_ADDRMAP0_R1
+#define CH2_VAL_DDRC_ADDRMAP6		CH2_VAL_DDRC_ADDRMAP6_R1
+#else
+#error unsupported memory rank/size
+#endif
+
+#if defined(CH2_VAL_DDRC_ADDRMAP0_R0) && defined(CH2_VAL_DDRC_ADDRMAP0_R1)
+#define CH2_LPDDR4_CS_NEW		LPDDR4_CS_R0
+#define CH2_VAL_DDRC_ADDRMAP0_NEW	CH2_VAL_DDRC_ADDRMAP0_R0
+#define CH2_VAL_DDRC_ADDRMAP6_NEW	CH2_VAL_DDRC_ADDRMAP6_R0
+#endif
+
+#else
+#error unsupported rank bits
+#endif
+
+#if (CONFIG_DDR_CHANNEL_CNT == 2)
+#if (CONFIG_DDR_RANK_BITS == 0) && !defined(CH2_VAL_DDRC_ADDRMAP0_R0)
+#error unsupported options
+#endif
+#if (CONFIG_DDR_RANK_BITS == 1) && !defined(CH2_VAL_DDRC_ADDRMAP0_R1)
+#error unsupported options
+#endif
+#endif

board/boundary/nitrogen8m_som/nitrogen8m_som.c

@@ -44,7 +44,7 @@ static iomux_v3_cfg_t const init_pads[] = {
 #define GP_LTK08_MIPI_EN		IMX_GPIO_NR(1, 1)
 	IMX8MQ_PAD_GPIO1_IO01__GPIO1_IO1 | MUX_PAD_CTRL(0x16),
 
-#define GPIRQ_GT911 			IMX_GPIO_NR(3, 12)
+#define GPIRQ_GT911				IMX_GPIO_NR(3, 12)
 	IMX8MQ_PAD_NAND_DATA06__GPIO3_IO12 | MUX_PAD_CTRL(0xd6),
 #define GP_GT911_RESET			IMX_GPIO_NR(3, 13)
 #define GP_ST1633_RESET			IMX_GPIO_NR(3, 13)
@@ -150,8 +150,40 @@ int dram_init(void)
 }
 
 #ifdef CONFIG_OF_BOARD_SETUP
+extern struct graphic_device imx_lcdif;
+
+int lcd_dt_simplefb_add_node(void *blob)
+{
+	static const char compat[] = "simple-framebuffer";
+	static const char disabled[] = "disabled";
+	int off, ret;
+
+	off = fdt_add_subnode(blob, 0, "framebuffer");
+	if (off < 0)
+		return -1;
+
+	ret = fdt_setprop(blob, off, "status", disabled, sizeof(disabled));
+	if (ret < 0)
+		return -1;
+
+	ret = fdt_setprop(blob, off, "compatible", compat, sizeof(compat));
+	if (ret < 0)
+		return -1;
+
+	return fdt_setup_simplefb_node(blob, off, gd->fb_base, imx_lcdif.winSizeX,
+	    imx_lcdif.winSizeY, imx_lcdif.winSizeX * imx_lcdif.gdfBytesPP,
+	    "x8r8g8b8");
+}
+
 int ft_board_setup(void *blob, bd_t *bd)
 {
+	/*
+	 * For now, we simply always add the simplefb DT node. Later, we
+	 * should be more intelligent, and e.g. only do this if no enabled DT
+	 * node exists for the "real" graphics driver.
+	 */
+	lcd_dt_simplefb_add_node(blob);
+
 	return 0;
 }
 #endif
@@ -230,14 +262,13 @@ int board_usb_init(int index, enum usb_init_type init)
 		return ret;
 	}
 
-	if (index == 1) {
-		/* Release HUB reset */
+	/*if (index == 1) {
 #define GP_USB1_HUB_RESET	IMX_GPIO_NR(1, 14)
 		imx_iomux_v3_setup_pad(IMX8MQ_PAD_GPIO1_IO14__GPIO1_IO14 |
-				       MUX_PAD_CTRL(WEAK_PULLUP));
+							 MUX_PAD_CTRL(WEAK_PULLUP));
 		gpio_request(GP_USB1_HUB_RESET, "usb1_rst");
 		gpio_direction_output(GP_USB1_HUB_RESET, 1);
-	}
+  }*/
 
 	return 0;
 }
@@ -258,6 +289,7 @@ int board_usb_cleanup(int index, enum usb_init_type init)
 
 int board_detect_hdmi(struct display_info_t const *di)
 {
+	printf("board_detect_hdmi()");
 	return hdmi_hpd_status() ? 1 : 0;
 }
 
@@ -274,9 +306,14 @@ static const struct display_info_t displays[] = {
 
 int board_init(void)
 {
+#ifdef CONFIG_CMD_FBPANEL
+	fbp_setup_display(displays, display_cnt);
+#endif
 	return 0;
 }
 
+// FIXME Reform: ideally we would save the env on the SD card, not the eMMC
+// but setting this to 1 crashes u-boot
 int board_mmc_get_env_dev(int devno)
 {
 	return 0;
@@ -301,9 +338,9 @@ static void addserial_env(const char* env_var)
 
 #ifdef CONFIG_CMD_BMODE
 const struct boot_mode board_boot_modes[] = {
-        /* 4 bit bus width */
+				/* 4 bit bus width */
 	{"emmc0",	MAKE_CFGVAL(0x22, 0x20, 0x00, 0x10)},
-        {NULL,          0},
+				{NULL,					0},
 };
 #endif
 
@@ -312,7 +349,7 @@ static int fastboot_key_pressed(void)
 	//gpio_request(GP_FASTBOOT_KEY, "fastboot_key");
 	//gpio_direction_input(GP_FASTBOOT_KEY);
 	//return !gpio_get_value(GP_FASTBOOT_KEY);
-  return 0;
+	return 0;
 }
 
 void board_late_mmc_env_init(void);
@@ -320,13 +357,28 @@ void init_usb_clk(int usbno);
 
 static void set_env_vars(void)
 {
-#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-	if (!env_get("board"))
-		env_set("board", "nitrogen8m_som");
+	env_set("board", "MNT Reform 2.0");
 	env_set("soc", "imx8mq");
+	env_set("fdtfile", "freescale/imx8mq-mnt-reform2.dtb");
 	env_set("imx_cpu", get_imx_type((get_cpu_rev() & 0xFF000) >> 12));
 	env_set("uboot_defconfig", CONFIG_DEFCONFIG);
+	env_set("stdin", "serial,usbkbd");
+	env_set("stdout", "serial,vga");
+	env_set("stderr", "serial,vga");
+
+	// MNT Reform 2
+	env_set("fdt_addr_r", "0x50000000");
+	env_set("ramdisk_addr_r", "0x44000000");
+#ifdef MNTREFORM_BOOT_RISCOS
+	env_set("bootcmd", "usb start; usb reset; ext4load mmc 1 ${loadaddr} /RISCOSIMX8M; go ${loadaddr} 32");
+#else
+	// boot normal system using distro_bootcmd
+	env_set("kernel_addr_r", "0x40480000");
+	env_set("pxefile_addr_r", "0x60000000");
+	env_set("scriptaddr", "0x61000000");
 #endif
+
+	env_set("bootdelay", "1");
 }
 
 void board_set_default_env(void)
@@ -338,9 +390,24 @@ void board_set_default_env(void)
 	board_eth_addresses();
 }
 
+static void
+reset_usb_hub(void)
+{
+	// Reform: Reset USB hub
+	imx_iomux_v3_setup_pad(IMX8MQ_PAD_GPIO1_IO14__GPIO1_IO14 | MUX_PAD_CTRL(WEAK_PULLUP));
+	gpio_request(IMX_GPIO_NR(1, 14), "usb1_rst");
+	gpio_direction_output(IMX_GPIO_NR(1, 14), 1);
+	gpio_set_value(IMX_GPIO_NR(1, 14), 0);
+	mdelay(10);
+	gpio_set_value(IMX_GPIO_NR(1, 14), 1);
+}
+
 int board_late_init(void)
 {
 	set_env_vars();
+
+	reset_usb_hub();
+
 #if defined(CONFIG_USB_FUNCTION_FASTBOOT) || defined(CONFIG_CMD_DFU)
 	addserial_env("serial#");
 	if (fastboot_key_pressed()) {
@@ -356,5 +423,28 @@ int board_late_init(void)
 #endif
 	init_usb_clk(0);
 	init_usb_clk(1);
+
+	usb_init();
+
 	return 0;
 }
+
+void
+board_quiesce_devices(void)
+{
+	extern void video_hw_exit(void);	/* lcdif.c */
+
+	usb_stop();
+	reset_usb_hub();
+
+	/*
+	 * Linux kermel mode setting seems to fail to
+	 * properly reset the mipi core, causing the
+	 * screen to be shifted to the right.
+	 *
+	 * As a work around, we reset the lcdif and
+	 * mipi core for it.
+	 */
+	if (images.os.os == IH_OS_LINUX)
+		video_hw_exit();
+}

board/boundary/nitrogen8m_som/spl.c

@@ -105,6 +105,7 @@ static struct fsl_esdhc_cfg usdhc_cfg[] = {
 int board_mmc_init(bd_t *bis)
 {
 	int i, ret;
+
 	/*
 	 * According to the board_mmc_init() the following map is done:
 	 * (U-Boot device node)    (Physical Port)
@@ -122,7 +123,7 @@ int board_mmc_init(bd_t *bis)
 			break;
 		case 1:
 			usdhc_cfg[1].sdhc_clk = mxc_get_clock(USDHC2_CLK_ROOT);
-			gpio_request(GP_EMMC_RESET, "usdhc2_reset");
+			gpio_request(USDHC2_PWR_GPIO, "usdhc2_reset");
 			gpio_direction_output(USDHC2_PWR_GPIO, 0);
 			udelay(500);
 			gpio_direction_output(USDHC2_PWR_GPIO, 1);

build.sh

+#!/bin/bash
+
+set -exu
+
+if [ -z ${SOURCE_DATE_EPOCH:+x} ] && git -C . rev-parse 2>/dev/null; then
+	export SOURCE_DATE_EPOCH=$(git log -1 --format=%ct)
+fi
+export CROSS_COMPILE=aarch64-linux-gnu-
+export ARCH=arm
+
+# avoid rebuilding everything every time
+export KBUILD_NOCMDDEP=1
+
+make -j$(nproc) flash.bin

cmd/boot.c

@@ -31,7 +31,15 @@ static int do_go(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
 	addr = simple_strtoul(argv[1], NULL, 16);
 
-	printf ("## Starting application at 0x%08lX ...\n", addr);
+	if (argc > 2) {
+    printf ("## Switching to AARCH32...\n");
+		armv8_switch_to_el1(0, (u64)0,
+												(u64)0, 0,
+												(u64)addr,
+												ES_TO_AARCH32);
+	}
+
+	printf ("## Starting application at 0x%08lX...\n", addr);
 
 	/*
 	 * pass address parameter as argv[0] (aka command name),

common/usb_kbd.c

@@ -117,6 +117,8 @@ struct usb_kbd_pdata {
 	uint8_t		old[USB_KBD_BOOT_REPORT_SIZE];
 
 	uint8_t		flags;
+
+	uint8_t		fakemod;
 };
 
 extern int __maybe_unused net_busy_flag;
@@ -168,6 +170,49 @@ static int usb_kbd_translate(struct usb_kbd_pdata *data, unsigned char scancode,
 {
 	uint8_t keycode = 0;
 
+	if(modifier == 0){
+		/* Emulate modifier keys for reform keyboard */
+		switch (scancode) {
+		case 0xe0:
+			if (pressed)
+				data->fakemod |= LEFT_CNTR;
+			else
+				data->fakemod &= ~LEFT_CNTR;
+			return 0;
+		case 0xe3:
+			if (pressed)
+				data->fakemod |= LEFT_GUI;
+			else
+				data->fakemod &= ~LEFT_GUI;
+			return 0;
+		case 0xe4:
+			if (pressed)
+				data->fakemod |= RIGHT_CNTR;
+			else
+				data->fakemod &= ~RIGHT_CNTR;
+			return 0;
+		case 0xe1:
+			if (pressed)
+				data->fakemod |= LEFT_SHIFT;
+			else
+				data->fakemod &= ~LEFT_SHIFT;
+			return 0;
+		case 0xe2:
+			if (pressed)
+				data->fakemod |= LEFT_ALT;
+			else
+				data->fakemod &= ~LEFT_ALT;
+			return 0;
+		case 0xe6:
+			if (pressed)
+				data->fakemod |= RIGHT_ALT;
+			else
+				data->fakemod &= ~RIGHT_ALT;
+			return 0;
+		}
+		modifier |= data->fakemod;
+	}
+
 	/* Key released */
 	if (pressed == 0) {
 		data->repeat_delay = 0;

flash-rescue.sh

+#!/bin/bash
+#
+# WARNING: This overwrites the bootloader on the eMMC rescue disk!
+#
+# This u-boot version expects /Image and /imx8mq-mnt-reform2.dtb
+# on /dev/mmcblk0p1
+#
+sudo dd if=flash-rescue.bin of=/dev/mmcblk0boot0 bs=1024 seek=33
+sync
+

flash.sh

+#!/bin/bash
+#double check the destination of this dd!!!
+#sudo dd if=flash.bin of=/dev/sda bs=1024 seek=33
+#sync
+

include/configs/nitrogen8m_som.h

@@ -95,7 +95,7 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_SIZE			0x2000
 #define CONFIG_ENV_OFFSET               (-CONFIG_ENV_SIZE)
-#define CONFIG_SYS_MMC_ENV_DEV		0	/* USDHC1 */
+#define CONFIG_SYS_MMC_ENV_DEV		1	/* USDHC1 */
 #define CONFIG_SYS_MMC_ENV_PART         1	/* mmcblk0boot0 */
 
 /* Size of malloc() pool */
@@ -105,7 +105,9 @@
 #define PHYS_SDRAM                      0x40000000
 
 #define CONFIG_SYS_MEMTEST_START    PHYS_SDRAM
-#define CONFIG_SYS_MEMTEST_END      (CONFIG_SYS_MEMTEST_START + 0x40000000u)
+#define CONFIG_SYS_MEMTEST_END      (CONFIG_SYS_MEMTEST_START + 0x40000000u) // 1 GB?!
+
+/* FIXME actual memory is in CONFIG_SYS_EXTRA_OPTIONS (DDR_MB) */
 
 #define CONFIG_BAUDRATE			115200
 
@@ -122,7 +124,7 @@
 
 #define CONFIG_FSL_USDHC
 
-#define CONFIG_SYS_FSL_USDHC_NUM	1
+#define CONFIG_SYS_FSL_USDHC_NUM	2
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
 #define CONFIG_SUPPORT_EMMC_BOOT	/* eMMC specific */
@@ -173,7 +175,8 @@
 #if (CONFIG_SYS_FSL_USDHC_NUM == 1)
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0)
 #elif (CONFIG_SYS_FSL_USDHC_NUM == 2)
-#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1)
+/* first try SD-Card, then eMMC */
+#define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 1) func(MMC, mmc, 0)
 #else
 #define DISTRO_BOOT_DEV_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) func(MMC, mmc, 2)
 #endif
@@ -194,7 +197,7 @@
 #endif
 
 #include <config_distro_bootcmd.h>
-#define CONFIG_CMD_FBPANEL
+/* #define CONFIG_CMD_FBPANEL*/
 
 #define BD_RAM_BASE	0x80000000
 #define BD_RAM_SCRIPT	"40020000"
@@ -206,7 +209,7 @@
 #define SYS_AUXCORE_BOOTDATA_DDR	0x80000000
 #define SYS_AUXCORE_BOOTDATA_TCM	0x007E0000
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
+#define CONFIG_EXTRA_ENV_SETTINGS             \
 	"console=" BD_CONSOLE "\0" \
 	"env_dev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
 	"env_part=" __stringify(CONFIG_SYS_MMC_ENV_PART) "\0" \
@@ -245,7 +248,7 @@
 		"setenv ipaddr 10.0.0.2; " \
 		"setenv netmask 255.255.255.0; " \
 		"setenv serverip 10.0.0.1;\0" \
-	BOOTENV
+    BOOTENV
 
 /*
  * PCI express