Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: m-labs/scripts
base: 732ececc67bf
...
head fork: m-labs/scripts
compare: 1196c217d435
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on May 21, 2012
Xiangfu Liu build jansson lib c63632b
Commits on Jun 20, 2012
Xiangfu Liu reflash_m1.sh : fix typo 1196c21
View
24 compile-flickernoise/Makefile
@@ -34,6 +34,7 @@ FREETYPE2_VERSION = 2.4.4
MUPDF_VERSION = 0.8
CURL_VERSION = 7.22.0
EXPAT_VERSION = 2.0.1
+JANSSON_VERSION = 2.3
LIBPNG = libpng-$(LIBPNG_VERSION).tar.gz
LIBJPEG = jpegsrc.v8c.tar.gz
@@ -43,6 +44,7 @@ FREETYPE2 = freetype-$(FREETYPE2_VERSION).tar.gz
MUPDF = mupdf-$(MUPDF_VERSION)-source.tar.gz
CURL = curl-$(CURL_VERSION).tar.bz2
EXPAT = expat-$(EXPAT_VERSION).tar.gz
+JANSSON = jansson-$(JANSSON_VERSION).tar.gz
DL = $(if $(wildcard ../dl/.),../dl,dl)
BUILD_DIR = ./build_dir
@@ -183,6 +185,19 @@ $(BUILD_DIR)/expat: $(DL)/$(EXPAT).ok
rm -rf $(RTEMS_MAKEFILE_PATH)/include/*
touch $@
+$(BUILD_DIR)/jansson: $(DL)/$(JANSSON).ok
+ tar xf $(DL)/$(JANSSON) -C $(BUILD_DIR)
+ cd $(BUILD_DIR)/jansson-$(JANSSON_VERSION) && \
+ patch -Np1 < ../../patches/jansson-0001-for-milkymist-one.patch.patch
+ cd $(BUILD_DIR)/jansson-$(JANSSON_VERSION) && \
+ $(CONFIGURE_VARS) ./configure --host=lm32-rtems4.11 \
+ --disable-shared --prefix=$(RTEMS_MAKEFILE_PATH) && \
+ make all install
+ cp -rf $(RTEMS_MAKEFILE_PATH)/include/* \
+ $(RTEMS_MAKEFILE_PATH)/lib/include
+ rm -rf $(RTEMS_MAKEFILE_PATH)/include/*
+ touch $@
+
REPO_DIRS=milkymist flickernoise rtems-yaffs2 liboscparse mtk autotest-m1
milkymist-git-clone:
mkdir -p $(MILKYMIST_GIT_DIR)
@@ -225,7 +240,8 @@ $(BUILD_DIR)/bsp-milkymist/Makefile:
#you will need clang for compile milkymist tools
flickernoise.fbi: rtems sdk-install mtk liboscparse rtems-yaffs2 \
- $(BUILD_DIR)/mupdf $(BUILD_DIR)/curl $(BUILD_DIR)/expat
+ $(BUILD_DIR)/mupdf $(BUILD_DIR)/curl $(BUILD_DIR)/expat \
+ $(BUILD_DIR)/jansson
make -C $(MILKYMIST_GIT_DIR)/flickernoise/src \
clean bin/flickernoise.fbi
cp $(MILKYMIST_GIT_DIR)/flickernoise/src/bin/$@ .
@@ -290,6 +306,12 @@ $(DL)/$(EXPAT).ok:
project/expat/expat/$(EXPAT_VERSION)/expat-$(EXPAT_VERSION).tar.gz"
touch $@
+$(DL)/$(JANSSON).ok:
+ mkdir -p dl
+ $(WGET) $(DL)/$(JANSSON) "http://www.digip.org/jansson/releases/$(JANSSON)"
+ touch $@
+
+
clean:
rm -rf build_dir/*
View
51 compile-flickernoise/patches/jansson-0001-for-milkymist-one.patch.patch
@@ -0,0 +1,51 @@
+From a20d4e9c81955bb0ebc790e2913e70796bfae092 Mon Sep 17 00:00:00 2001
+From: Xiangfu <xiangfu@openmobilefree.net>
+Date: Mon, 21 May 2012 12:45:24 +0800
+Subject: [PATCH] jansson-0001-for-milkymist-one.patch
+
+---
+ src/Makefile.am | 2 +-
+ src/Makefile.in | 2 +-
+ src/utf.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 80c03de..c7e4f9a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,5 +24,5 @@ libjansson_la_LDFLAGS = \
+
+ if GCC
+ # These flags are gcc specific
+-AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement -Werror
++AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement
+ endif
+diff --git a/src/Makefile.in b/src/Makefile.in
+index cc50ee2..0c9639a 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -237,7 +237,7 @@ libjansson_la_LDFLAGS = \
+
+
+ # These flags are gcc specific
+-@GCC_TRUE@AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement -Werror
++@GCC_TRUE@AM_CFLAGS = -Wall -Wextra -Wdeclaration-after-statement
+ all: all-am
+
+ .SUFFIXES:
+diff --git a/src/utf.h b/src/utf.h
+index 0c3ab31..2bc9d6d 100644
+--- a/src/utf.h
++++ b/src/utf.h
+@@ -28,7 +28,7 @@ typedef int int32_t;
+
+ #endif /* HAVE_CONFIG_H */
+
+-int utf8_encode(int codepoint, char *buffer, int *size);
++int utf8_encode(int32_t codepoint, char *buffer, int *size);
+
+ int utf8_check_first(char byte);
+ int utf8_check_full(const char *buffer, int size, int32_t *codepoint);
+--
+1.7.5.4
+
View
23 scripts/reflash_m1.sh
@@ -27,26 +27,31 @@ MAC_DIR="${HOME}/.qi/milkymist/bios-mac/tmp"
call-help() {
echo -e \
-"Usage: ./reflash_m1.sh [OPTION] [PARAM]...
+"
+Usage: ./reflash_m1.sh [OPTION] [PARAM...]
--release [VERSION] by default it will download the latest release
- --local-folder please use m1nor instread
+ --local-folder please use m1nor instead
--lock-flash lock 'standby' and 'rescue' partitions
--read-flash <PARTITION> read from RESCUE partition, by default only read
- 'standby.bin'
- PARTITION: standby soc bios splash flickernoise
+ 'standby.bin'
+ PARTITION: standby soc bios splash flickernoise
--bios-mac XX XX 'XX' 'XX' is the last MAC address
--rc3 XX XX used in factory flash, reflash all partitions
--qi [VERSION] [--data] by default it will download the latest qi release
- CAUTION: if '--data' enable, it will REFLASH DATA PARTITION
NOTICE: '--bios-mac' and '--rc3' needs command 'mkmmimg'
- '--release' VERSION can found at http://milkymist.org/updates/
- '--qi' VERSION can found at
- http://downloads.qi-hardware.com/software/images/Milkymist_One
+ '--release' VERSION can found at http://milkymist.org/updates/
+ '--qi' VERSION can found at
+ http://downloads.qi-hardware.com/software/images/Milkymist_One
+ '--data' if this option enable, it will REFLASH DATA PARTITION
+ BACKUP before you use this option
+
+Version: ${__VERSION__}
Written by: Xiangfu Liu <xiangfu@openmobilefree.net>
-Please report bugs to <devel@lists.milkymist.org>\tversion: ${__VERSION__}"
+Please report bugs to <devel@lists.milkymist.org>
+"
}
# $1: is the file name you want save

No commit comments for this range

Something went wrong with that request. Please try again.