Skip to content

Commit

Permalink
delta_tn48m: Add newline to end of onie-plarform-env.patch
Browse files Browse the repository at this point in the history
The build currently fails due to a patch with no newline at the end.

    $ make MACHINEROOT=../machine/delta MACHINE=delta_tn48m all V=1
    […]
    Initialized empty Git repository in /dev/shm/onie/build/delta_tn48m-r0/u-boot/u-boot-2018.03/.git/
    Checking for changes in the working directory ... done
    […]
    Importing patch "0001-Marvell-u-boot-armada7020" ... <stdin>:24187: trailing whitespace.

    <stdin>:24256: trailing whitespace.

    <stdin>:31865: space before tab in indent.
                    The boot image will be encrypted if this parameter is included
    <stdin>:52996: trailing whitespace.

    <stdin>:53007: space before tab in indent.
            /* Read PCS MISCS CTL */
    warning: squelched 75 whitespace errors
    warning: 80 lines add whitespace errors.

      Now at patch "0001-Marvell-u-boot-armada7020"
    done
    Importing patch "onie-plarform-env.patch" ... error: corrupt patch at
    line 15
    done
    stg import: Patch does not apply cleanly

Adding the newline fixes the issue.

Fixes: b5adc20 ("Add new platform: delta_tn48m")
Signed-off-by: Paul Menzel <[email protected]>
Signed-off-by: Alex Doyle <[email protected]>
  • Loading branch information
paulmenzel authored and ehdoyle committed Apr 1, 2021
1 parent f9e7c28 commit b996480
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion machine/delta/delta_tn48m/u-boot/onie-plarform-env.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ index daac8ba..9ad9af2 100644
+ "onie_start=0x00400000\0" \
+ "onie_sz.b=0x00C00000\0"
+
#endif /* _CONFIG_MVEBU_ARMADA_8K_H */
#endif /* _CONFIG_MVEBU_ARMADA_8K_H */

0 comments on commit b996480

Please sign in to comment.