Good catch. I had a few merge-conflicts when merging that series. That one might have gotten lost.
On 8 May 2018, at 12:31, Jonathan Gray jsg@jsg.id.au wrote:
On Tue, May 08, 2018 at 09:41:32AM +0200, Dr. Philipp Tomsich wrote:
Kever,
Could you analyse and provide (against master) a patch for this? We???ll need to catch any left-overs from your changes at the start of the cycle before we try to merge any of the more invasive changes you have in-flight.
Thanks, Philipp.
The patch in https://patchwork.ozlabs.org/patch/900546/ had a change in include/configs/rockchip-common.h which was not included in the commit that made it into to tree as c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
After adding that back it works.
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index dee82ca99d..68e1105a4b 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -7,6 +7,8 @@ #define _ROCKCHIP_COMMON_H_ #include <linux/sizes.h>
+#define CONFIG_SYS_NS16550_MEM32
#ifndef CONFIG_SPL_BUILD
/* First try to boot from SD (index 0), then eMMC (index 1) */