aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ath79/image/lzma-loader/src/loader.c
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-06-06 21:01:32 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-06-06 22:25:53 +0200
commitc57e182b560e4c93377270d470600095c2b580fe (patch)
treef8c6eb4387902378e6bad9d3dbd5abbfa1a79d27 /target/linux/ath79/image/lzma-loader/src/loader.c
parent108a6f6792bc50fa5b1627c207ae71ba555b55f8 (diff)
downloadupstream-c57e182b560e4c93377270d470600095c2b580fe.tar.gz
upstream-c57e182b560e4c93377270d470600095c2b580fe.tar.bz2
upstream-c57e182b560e4c93377270d470600095c2b580fe.zip
ath79: lzma-loader: sync with ar71xx target
Import all improvements made in the lzma-loader since development on the ath79 target started. This also reverts fe594bf90d09 ("ath79: fix loader-okli, lzma-loader"), as is obsoleted by 2ad60168b6af ("ar71xx: lzma-loader: move padding workaround to gzip step"). Likely, many of the changes should be ported to the ramips lzma-loader as well, but I don't have a device to test this. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'target/linux/ath79/image/lzma-loader/src/loader.c')
-rw-r--r--target/linux/ath79/image/lzma-loader/src/loader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ath79/image/lzma-loader/src/loader.c b/target/linux/ath79/image/lzma-loader/src/loader.c
index cc73eb1721..794c4b6285 100644
--- a/target/linux/ath79/image/lzma-loader/src/loader.c
+++ b/target/linux/ath79/image/lzma-loader/src/loader.c
@@ -75,7 +75,7 @@ static unsigned long kernel_la;
#ifdef CONFIG_KERNEL_CMDLINE
#define kernel_argc 2
static const char kernel_cmdline[] = CONFIG_KERNEL_CMDLINE;
-static const char *kernel_argv[] = {
+static const char *const kernel_argv[] = {
NULL,
kernel_cmdline,
NULL,