#!/usr/bin/env bash export LANG=C export LC_ALL=C [ -n "$TOPDIR" ] && cd $TOPDIR GET_REV=$1 try_version() { [ -f version ] || return 1 REV="$(cat version)" [ -n "$REV" ] } try_git() { REBOOT=ee53a240ac902dc83209008a2671e7fdcf55957a git rev-parse --git-dir >/dev/null 2>&1 || return 1 [ -n "$GET_REV" ] || GET_REV="HEAD" case "$GET_REV" in r*) GET_REV="$(echo $GET_REV | tr -d 'r')" BASE_REV="$(git rev-list ${REBOOT}..HEAD | wc -l | awk '{print $1}')" REV="$(git rev-parse HEAD~$((BASE_REV - GET_REV)))" ;; *) BRANCH="$(git rev-parse --abbrev-ref HEAD)" ORIGIN="$(git rev-parse --verify --symbolic-full-name ${BRANCH}@{u} 2>/dev/null)" [ -n "$ORIGIN" ] || ORIGIN="$(git rev-parse --verify --symbolic-full-name master@{u} 2>/dev/null)" REV="$(git rev-list ${REBOOT}..$GET_REV | wc -l | awk '{print $1}')" if [ -n "$ORIGIN" ]; then UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)" UPSTREAM_REV="$(git rev-list ${REBOOT}..$UPSTREAM_BASE | wc -l | awk '{print $1}')" else UPSTREAM_REV=0 fi if [ "$REV" -gt "$UPSTREAM_REV" ]; then REV="${UPSTREAM_REV}+$((REV - UPSTREAM_REV))" fi REV="${REV:+r$REV-$(git log -n 1 --format="%h" $UPSTREAM_BASE)}" ;; esac [ -n "$REV" ] } try_hg() { [ -d .hg ] || return 1 REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')" REV="${REV:+r$REV}" [ -n "$REV" ] } try_version || try_git || try_hg || REV="unknown" echo "$REV" > upstream openwrtJames
aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/301-mips_image_cmdline_hack.patch
blob: bc49e5b40e3829ae13a391ddd0a0ea9af5495ed7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From: John Crispin <john@phrozen.org>
Subject: hack: kernel: add generic image_cmdline hack to MIPS targets

lede-commit: d59f5b3a987a48508257a0ddbaeadc7909f9f976
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
---
 arch/mips/Kconfig       | 4 ++++
 arch/mips/kernel/head.S | 6 ++++++
 2 files changed, 10 insertions(+)

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1161,6 +1161,10 @@ config SYNC_R4K
 config MIPS_MACHINE
 	def_bool n
 
+config IMAGE_CMDLINE_HACK
+	bool "OpenWrt specific image command line hack"
+	default n
+
 config NO_IOPORT_MAP
 	def_bool n
 
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -79,6 +79,12 @@ FEXPORT(__kernel_entry)
 	j	kernel_entry
 #endif
 
+#ifdef CONFIG_IMAGE_CMDLINE_HACK
+	.ascii	"CMDLINE:"
+EXPORT(__image_cmdline)
+	.fill	0x400
+#endif /* CONFIG_IMAGE_CMDLINE_HACK */
+
 	__REF
 
 NESTED(kernel_entry, 16, sp)			# kernel entry point