diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:06 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-05-09 14:17:06 +0200 |
commit | a90a0bbf41e2fc251d31de604e06895ef1db05fa (patch) | |
tree | 1dcd66396a2abf9ace3a61ce04722fed35ca3e41 /arch | |
parent | 091b51c0a9479d4d917d399e018f51db3d6332f9 (diff) | |
parent | a8a03551034bee6d2a66fc514342664f760bb4b6 (diff) | |
download | barebox-a90a0bbf41e2fc251d31de604e06895ef1db05fa.tar.gz barebox-a90a0bbf41e2fc251d31de604e06895ef1db05fa.tar.xz |
Merge branch 'for-next/state'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/dts/am335x-phytec-state.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/dts/am335x-phytec-state.dtsi b/arch/arm/dts/am335x-phytec-state.dtsi index fbc35b9184..6bca597159 100644 --- a/arch/arm/dts/am335x-phytec-state.dtsi +++ b/arch/arm/dts/am335x-phytec-state.dtsi @@ -23,6 +23,7 @@ backend-type = "raw"; backend = <&backend_state_eeprom>; backend-stridesize = <40>; + keep-previous-content; #address-cells = <1>; #size-cells = <1>; |