---

yaml
---
r: 340223
b: refs/heads/master
c: 6431165
h: refs/heads/master
i:
  340221: 01d1a8c
  340219: b8d40d2
  340215: 90f667d
  340207: 0ad1822
  340191: 46eac91
  340159: fa3bc83
  340095: 28fa18f
  339967: a59e057
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07f645df9ff2550749b806af626576d5ad418215
+refs/heads/master: 6431165fac43a8d48bf77a732791ac9138187a58

trunk/arch/arm/configs/orion5x_defconfig

@@ -27,7 +27,7 @@ CONFIG_MACH_TS409=y
 CONFIG_MACH_WRT350N_V2=y
 CONFIG_MACH_TS78XX=y
 CONFIG_MACH_MV2120=y
-CONFIG_MACH_EDMINI_V2=y
+CONFIG_MACH_EDMINI_V2_DT=y
 CONFIG_MACH_D2NET=y
 CONFIG_MACH_BIGDISK=y
 CONFIG_MACH_NET2BIG=y
@@ -40,6 +40,7 @@ CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
 CONFIG_FPE_NWFPE=y
 CONFIG_VFP=y
 CONFIG_NET=y
@@ -94,6 +95,7 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set