Changeset 1215

Timestamp:

06/26/11 01:02:19 (23 months ago)

Author:

reyalp

Message:

beta s95 100k support from waterwingz in ​http://chdk.setepontos.com/index.php?topic=650.msg69353#msg69353

Location:

trunk

Files:

• Makefile (modified) (5 diffs)
• makefile.inc (modified) (1 diff)
• platform/s95/sub/100k (added)
• platform/s95/sub/100k/Makefile (added)
• platform/s95/sub/100k/boot.c (added)
• platform/s95/sub/100k/capt_seq.c (added)
• platform/s95/sub/100k/lib.c (added)
• platform/s95/sub/100k/makefile.inc (added)
• platform/s95/sub/100k/movie_rec.c (added)
• platform/s95/sub/100k/stubs_asm.h (added)
• platform/s95/sub/100k/stubs_auto.S (added)
• platform/s95/sub/100k/stubs_entry.S (added)
• platform/s95/sub/100k/stubs_entry_2.S (added)
• platform/s95/sub/100k/stubs_min.S (added)
• platform/s95/sub/100k/stubs_tasks.c (added)

trunk/Makefile

@@ -273 +273 @@
         $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100h NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100i NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100k NO_INC_BUILD=1 firzipsub
         #$(MAKE) -s --no-print-directory PLATFORM=ixus300_sd4000 PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub
         @echo "**** All firmwares created successfully"
@@ -323 +324 @@
         mv $(topdir)bin/$(VER)-s95-100h-$(BUILD_NUMBER).zip $(topdir)bin/s95-100h-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-s95-100i-$(BUILD_NUMBER).zip $(topdir)bin/s95-100i-$(BUILD_NUMBER)_BETA.zip
+        mv $(topdir)bin/$(VER)-s95-100k-$(BUILD_NUMBER).zip $(topdir)bin/s95-100k-$(BUILD_NUMBER)_BETA.zip      
         mv $(topdir)bin/$(VER)-ixus750_sd550-100h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus750_sd550-100h-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-a490-100f-$(BUILD_NUMBER).zip $(topdir)bin/a490-100f-$(BUILD_NUMBER)_BETA.zip
@@ -463 +465 @@
         $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100h NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100i NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100k NO_INC_BUILD=1 firzipsubcomplete 
         #$(MAKE) -s --no-print-directory PLATFORM=ixus300_sd4000 PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete
         @echo "**** All zipfiles including firmwares and extra stuff created successfully"
@@ -560 +563 @@
         mv $(topdir)bin/s95-100i-$(BUILD_NUMBER)-full.zip $(topdir)bin/s95-100i-$(BUILD_NUMBER)-full_BETA.zip
         mv $(topdir)bin/s95-100i-$(BUILD_NUMBER).zip $(topdir)bin/s95-100i-$(BUILD_NUMBER)_BETA.zip
+        mv $(topdir)bin/s95-100k-$(BUILD_NUMBER)-full.zip $(topdir)bin/s95-100k-$(BUILD_NUMBER)-full_BETA.zip
+        mv $(topdir)bin/s95-100k-$(BUILD_NUMBER).zip $(topdir)bin/s95-100k-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER).zip $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus750_sd550-100h-$(BUILD_NUMBER)-full_BETA.zip
@@ -701 +706 @@
         $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100h NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100i NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=s95  PLATFORMSUB=100k NO_INC_BUILD=1 clean     
         #$(MAKE) -s --no-print-directory PLATFORM=ixus300_sd4000  PLATFORMSUB=100d NO_INC_BUILD=1 clean
         .PHONY: fir upload

trunk/makefile.inc

@@ -340 +340 @@
 #PLATFORM=s95
 #PLATFORMSUB=100i
+
+#PLATFORM=s95
+#PLATFORMSUB=100k
 
 #PLATFORM=ixus300_sd4000