diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
| commit | 65ac015415845d235f3b7d78be142537e180e839 (patch) | |
| tree | f1ca27d0e5956f7848db695153d4d4a6944a640b /arch | |
| parent | fbb13e75beef38d261904355dbb0f2d259bf6db1 (diff) | |
| parent | 844261c4ac0c7095fcbe0e7ae8b44fe2c687ca01 (diff) | |
| download | barebox-65ac015415845d235f3b7d78be142537e180e839.tar.gz barebox-65ac015415845d235f3b7d78be142537e180e839.tar.xz | |
Merge branch 'for-next/am335x'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phycore-som.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phyflex.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/am335x-phytec-phycore-som.dtsi b/arch/arm/dts/am335x-phytec-phycore-som.dtsi index 246b5aa62d..c34ae38271 100644 --- a/arch/arm/dts/am335x-phytec-phycore-som.dtsi +++ b/arch/arm/dts/am335x-phytec-phycore-som.dtsi @@ -161,7 +161,7 @@ partition@4 { label = "kernel"; - reg = <0xe0000 0x400000>; + reg = <0xe0000 0x0>; }; }; }; diff --git a/arch/arm/dts/am335x-phytec-phyflex.dts b/arch/arm/dts/am335x-phytec-phyflex.dts index 6679cf56db..6c49567107 100644 --- a/arch/arm/dts/am335x-phytec-phyflex.dts +++ b/arch/arm/dts/am335x-phytec-phyflex.dts @@ -187,7 +187,7 @@ partition@4 { label = "kernel"; - reg = <0xe0000 0x400000>; + reg = <0xe0000 0x0>; }; }; }; |