From 7c522b22c92ef1b5200718b6179afd000c617a34 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Mon, 9 Jul 2012 15:43:34 +0800 Subject: [PATCH 1/4] m1/patches/rtems: sync with latest rtems, 2 more patches applied --- m1/patches/rtems/series | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m1/patches/rtems/series b/m1/patches/rtems/series index ec2fcfd..026ea29 100644 --- a/m1/patches/rtems/series +++ b/m1/patches/rtems/series @@ -19,9 +19,9 @@ # fix-ftpd-root.patch - applied 2012-02-02 # mem-fixes.patch - fixed 2012-02-02 # fix-the-vga-vsync-pulses.patch- applied 2012-03-04 -fix-dns-in-dhcp.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=1841 +# fix-dns-in-dhcp.patch - applied 2012-05-22 export-shell-fns.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=2030 -bootp-dhcp-cleanup.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=2031 +# bootp-dhcp-cleanup.patch - applied 2012-05-22 # usb-firmware-ioctl.patch - applied 2012-03-04 # fix-pmem-size.patch - applied 2012-03-06 milkymist-audio-add-support-mic-boost.patch From cade6946e6e1614f757599c5e13576ecacdaa18e Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Mon, 9 Jul 2012 15:58:00 +0800 Subject: [PATCH 2/4] m1/patches/rtems: add the bug url to comment --- m1/patches/rtems/series | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m1/patches/rtems/series b/m1/patches/rtems/series index 026ea29..28887db 100644 --- a/m1/patches/rtems/series +++ b/m1/patches/rtems/series @@ -24,4 +24,4 @@ export-shell-fns.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=2030 # bootp-dhcp-cleanup.patch - applied 2012-05-22 # usb-firmware-ioctl.patch - applied 2012-03-04 # fix-pmem-size.patch - applied 2012-03-06 -milkymist-audio-add-support-mic-boost.patch +milkymist-audio-add-support-mic-boost.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=2045 From c9efa64c0901042b6f1135e2ef72d25a293a7e0b Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Mon, 9 Jul 2012 20:19:47 +0800 Subject: [PATCH 3/4] m1/patches/rtems: mic-boost patch applied in upstream --- m1/patches/rtems/series | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m1/patches/rtems/series b/m1/patches/rtems/series index 28887db..6bead98 100644 --- a/m1/patches/rtems/series +++ b/m1/patches/rtems/series @@ -20,8 +20,8 @@ # mem-fixes.patch - fixed 2012-02-02 # fix-the-vga-vsync-pulses.patch- applied 2012-03-04 # fix-dns-in-dhcp.patch - applied 2012-05-22 -export-shell-fns.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=2030 # bootp-dhcp-cleanup.patch - applied 2012-05-22 # usb-firmware-ioctl.patch - applied 2012-03-04 # fix-pmem-size.patch - applied 2012-03-06 -milkymist-audio-add-support-mic-boost.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=2045 +# milkymist-audio-add-support-mic-boost.patch - applied 2012-07-09 +export-shell-fns.patch # https://www.rtems.org/bugzilla/show_bug.cgi?id=2030 From c84ba205c0a724f9007a1d53d6138f50a5759c20 Mon Sep 17 00:00:00 2001 From: Xiangfu Date: Thu, 12 Jul 2012 09:16:56 +0800 Subject: [PATCH 4/4] m1/tools/m1nor: erase data partition before reflash --- m1/tools/m1nor | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m1/tools/m1nor b/m1/tools/m1nor index 0993da7..76ff895 100755 --- a/m1/tools/m1nor +++ b/m1/tools/m1nor @@ -100,6 +100,9 @@ endian big EOF for n in "$@"; do classify "$n" + if [ "$off" == "0xd20000" ]; then + echo eraseflash 0xd20000 151 + fi echo flashmem "$off" "$n" noverify done echo lockflash 0 55