Context Navigation

← Previous Changeset
Next Changeset →

Changeset 801

Timestamp:

09/18/09 06:32:56 (4 years ago)

Author:

reyalp

Message:

clean up FI2 handling in makefiles, now only the KEYSYS values needs to be set in each platformsub makefile.inc
clean misc makefile cruft, update sd990 notes.txt
add support for optional localbuildconf.inc, equivalent to buildconf.inc but not in svn
force OPT_FI2 off for SX1, even if set on command line.
support for ixus200/sd980 diskboot encoding in dancingbits as version 3 (UNTESTED!)

Location:

trunk

Files:

: 40 edited

buildconf.inc (modified) (1 diff)
makefile.inc (modified) (1 diff)
platform/a2000/sub/100c/makefile.inc (modified) (2 diffs)
platform/a470/sub/100e/makefile.inc (modified) (1 diff)
platform/a470/sub/101b/makefile.inc (modified) (1 diff)
platform/a470/sub/102c/makefile.inc (modified) (1 diff)
platform/a540/sub/100b/makefile.inc (modified) (1 diff)
platform/a590/sub/100e/makefile.inc (modified) (1 diff)
platform/a590/sub/101b/makefile.inc (modified) (1 diff)
platform/a650/sub/100d/makefile.inc (modified) (1 diff)
platform/a720/sub/100c/makefile.inc (modified) (1 diff)
platform/g9/sub/100d/makefile.inc (modified) (1 diff)
platform/g9/sub/100g/makefile.inc (modified) (1 diff)
platform/g9/sub/100i/makefile.inc (modified) (1 diff)
platform/ixus80_sd1100/sub/100c/makefile.inc (modified) (1 diff)
platform/ixus80_sd1100/sub/101a/makefile.inc (modified) (1 diff)
platform/ixus860_sd870/sub/100c/makefile.inc (modified) (1 diff)
platform/ixus870_sd880/sub/100e/makefile.inc (modified) (1 diff)
platform/ixus870_sd880/sub/101a/makefile.inc (modified) (1 diff)
platform/ixus870_sd880/sub/102b/makefile.inc (modified) (1 diff)
platform/ixus960_sd950/sub/100d/makefile.inc (modified) (1 diff)
platform/ixus970_sd890/sub/100b/makefile.inc (modified) (1 diff)
platform/ixus970_sd890/sub/100c/makefile.inc (modified) (1 diff)
platform/ixus970_sd890/sub/100f/makefile.inc (modified) (1 diff)
platform/ixus980_sd990/notes.txt (modified) (2 diffs)
platform/ixus980_sd990/sub/100e/makefile.inc (modified) (1 diff)
platform/ixus980_sd990/sub/101b/makefile.inc (modified) (1 diff)
platform/s5is/sub/101a/makefile.inc (modified) (1 diff)
platform/s5is/sub/101b/makefile.inc (modified) (1 diff)
platform/sx1/sub/200h/makefile.inc (modified) (1 diff)
platform/sx1/sub/201a/makefile.inc (modified) (1 diff)
platform/sx10/sub/100c/makefile.inc (modified) (1 diff)
platform/sx10/sub/101a/makefile.inc (modified) (1 diff)
platform/sx10/sub/101b/makefile.inc (modified) (1 diff)
platform/sx10/sub/102b/makefile.inc (modified) (1 diff)
platform/sx10/sub/103a/makefile.inc (modified) (1 diff)
platform/sx100is/sub/100b/makefile.inc (modified) (2 diffs)
platform/sx100is/sub/100c/makefile.inc (modified) (1 diff)
platform/sx110is/sub/100b/makefile.inc (modified) (1 diff)
tools/dancingbits.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/buildconf.inc

-                      r743
+                      r801
 OPT_LUA_STRLIB=1
 #OPT_MD_DEBUG=1
+#OPT_FI2=1                  // needs proper fi2.inc in platform/ !!! see http://chdk.setepontos.com/index.php/topic,2995.0.html
+#OPT_WARNINGS=1              // if enabled, compiler will produce a lot of warnings, maybe not always correct ones, see http://chdk.setepontos.com/index.php/topic,2509.msg32191.html#msg32191
+#!OPT_UBASIC=1              // Shall ubasic be compiled into build? not done yet
+#!OPT_LUA=1                 // Shall lua support be compiled into build? not done yet
+#!OPT_SYMBOLS=1             // the symbols / not done yet
+#!OPT_LANGUAGEINTERFACE=1   // for people who won't use lang files at all / not done yet
+# needs proper fi2.inc in platform/ !!! see http://chdk.setepontos.com/index.php/topic,2995.0.html
+#OPT_FI2=1
+# if enabled, compiler will produce a lot of warnings, maybe not always correct ones, see http://chdk.setepontos.com/index.php/topic,2509.msg32191.html#msg32191
+#OPT_WARNINGS=1
+# Shall ubasic be compiled into build? not done yet
+#!OPT_UBASIC=1
+# Shall lua support be compiled into build? not done yet
+#!OPT_LUA=1
+# the symbols / not done yet
+#!OPT_SYMBOLS=1
+# for people who won't use lang files at all / not done yet
+#!OPT_LANGUAGEINTERFACE=1

trunk/makefile.inc

-                      r797
+                      r801
 PRIMARY_ROOT=$(topdir)platform
 include $(topdir)buildconf.inc
+# optional local version of buildconf.inc, not in SVN so it can be used in autobuilds
+# and to avoid getting accidentally included in svn diffs
+# you may also set your default camera here
+-include $(topdir)localbuildconf.inc
 include $(topdir)version.inc
 include $(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)/makefile.inc
+ifdef OPT_FI2
+include $(topdir)/platform/fi2.inc
+endif
 SILENT=SILENT

trunk/platform/a2000/sub/100c/makefile.inc

-                      r799
+                      r801
 ROMBASEADDR=0xffc00000
-TARGET_PRIMARY=$(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)/PRIMARY.BIN
 PLFLAGS=-DMEMBASEADDR=$(MEMBASEADDR) -DMEMISOSTART=$(MEMISOSTART) -DMEMISOSIZE=$(MEMISOSIZE)
 PLFLAGS+=-DRESTARTSTART=$(RESTARTSTART)
 …
 KEYSYS=d4
-ifdef OPT_FI2
-include $(topdir)/platform/fi2.inc
-endif

trunk/platform/a470/sub/100e/makefile.inc

r794	r801
14	14	NEED_ENCODED_DISKBOOT=1
15	15	KEYSYS=d3enc
16		~~ifdef OPT_FI2~~
17		~~include $(topdir)platform/fi2.inc~~
18		~~endif~~

trunk/platform/a470/sub/101b/makefile.inc

r794	r801
14	14	NEED_ENCODED_DISKBOOT=1
15	15	KEYSYS=d3enc
16		~~ifdef OPT_FI2~~
17		~~include $(topdir)platform/fi2.inc~~
18		~~endif~~

trunk/platform/a470/sub/102c/makefile.inc

r794	r801
14	14	NEED_ENCODED_DISKBOOT=1
15	15	KEYSYS=d3enc
16		~~ifdef OPT_FI2~~
17		~~include $(topdir)platform/fi2.inc~~
18		~~endif~~

trunk/platform/a540/sub/100b/makefile.inc

r634	r801
1		#0x3139
	1	#0x311B
2	2	PLATFORMID=12571
3	3

trunk/platform/a590/sub/100e/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d3enc
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/a590/sub/101b/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d3enc
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/a650/sub/100d/makefile.inc

r709	r801
13	13	PLFLAGS+=-DRESTARTSTART=$(RESTARTSTART)
14	14	KEYSYS=d3
15		~~ifdef OPT_FI2~~
16		~~include $(topdir)platform/fi2.inc~~
17		~~endif~~
18

trunk/platform/a720/sub/100c/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/g9/sub/100d/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/g9/sub/100g/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/g9/sub/100i/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/ixus80_sd1100/sub/100c/makefile.inc

r794	r801
17	17	NEED_ENCODED_DISKBOOT=1
18	18	KEYSYS=d3enc
19		~~ifdef OPT_FI2~~
20		~~include $(topdir)platform/fi2.inc~~
21		~~endif~~
22

trunk/platform/ixus80_sd1100/sub/101a/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d3enc
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/ixus860_sd870/sub/100c/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/ixus870_sd880/sub/100e/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/ixus870_sd880/sub/101a/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/ixus870_sd880/sub/102b/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/ixus960_sd950/sub/100d/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/ixus970_sd890/sub/100b/makefile.inc

r794	r801
16	16
17	17	KEYSYS=d3enc
18		~~ifdef OPT_FI2~~
19		~~include $(topdir)platform/fi2.inc~~
20		~~endif~~

trunk/platform/ixus970_sd890/sub/100c/makefile.inc

r794	r801
16	16
17	17	KEYSYS=d3enc
18		~~ifdef OPT_FI2~~
19		~~include $(topdir)platform/fi2.inc~~
20		~~endif~~

trunk/platform/ixus970_sd890/sub/100f/makefile.inc

r794	r801
16	16
17	17	KEYSYS=d3enc
18		~~ifdef OPT_FI2~~
19		~~include $(topdir)platform/fi2.inc~~
20		~~endif~~

trunk/platform/ixus980_sd990/notes.txt

-                      r792
+                      r801
 Features known BROKEN or NOT supported:
+- DNG extension over USB.
 - Zebra
 - Edge overlay
 …
 - Intermittent raw. If you press the shutter quickly (or maybe some other factor), RAW/DNG
   may not be saved.
+- Due to the higher resolution of the bit, many parts of the CHDK display appear small.

trunk/platform/ixus980_sd990/sub/100e/makefile.inc

-                      r794
+                      r801
 PLFLAGS+=-DRESTARTSTART=$(RESTARTSTART)
+# type of diskboot encoding: undefined = none; 1 = original; 2 = sx200
 NEED_ENCODED_DISKBOOT=1
+# type of FI2 encoding
+KEYSYS=d4
-KEYSYS=d4
-ifdef OPT_FI2
-include $(topdir)/platform/fi2.inc
-endif

trunk/platform/ixus980_sd990/sub/101b/makefile.inc

-                      r794
+                      r801
 KEYSYS=d4
-ifdef OPT_FI2
-include $(topdir)/platform/fi2.inc
-endif

trunk/platform/s5is/sub/101a/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/s5is/sub/101b/makefile.inc

-                      r709
+                      r801
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx1/sub/200h/makefile.inc

-                      r794
+                      r801
 PLFLAGS+=-DRESTARTSTART=$(RESTARTSTART)
+OPT_FI2=
+# suppress FI2 since it doesn't work
+override OPT_FI2=
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx1/sub/201a/makefile.inc

-                      r794
+                      r801
 PLFLAGS+=-DRESTARTSTART=$(RESTARTSTART)
+OPT_FI2=
+# suppress FI2 since it doesn't work
+override OPT_FI2=
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx10/sub/100c/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx10/sub/101a/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx10/sub/101b/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx10/sub/102b/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx10/sub/103a/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx100is/sub/100b/makefile.inc

-                      r709
+                      r801
 RESTARTSTART=0x50000
 MEMISOSTART=0x9F498
-//MEMISOSIZE=0x50000
 ROMBASEADDR=0xffc00000
 …
 KEYSYS=d3
-ifdef OPT_FI2
-include  $(topdir)platform/fi2.inc
-endif

trunk/platform/sx100is/sub/100c/makefile.inc

r709	r801
14	14
15	15	KEYSYS=d3
16		~~ifdef OPT_FI2~~
17		~~include $(topdir)platform/fi2.inc~~
18		~~endif~~
19

trunk/platform/sx110is/sub/100b/makefile.inc

-                      r794
+                      r801
 NEED_ENCODED_DISKBOOT=1
 KEYSYS=d4
-#KEYSYS=d3
-ifdef OPT_FI2
-include $(topdir)/platform/fi2.inc
-endif

trunk/tools/dancingbits.c

-                      r794
+                      r801
 #include <errno.h>
 #define VITALY 2
+#define VITALY 3
 unsigned char _chr_[VITALY][8] = {
                                                                         { 4,6,1,0,7,2,5,3 },
+                                                                        { 5,3,6,1,2,7,0,4 }
+                                                                        { 5,3,6,1,2,7,0,4 },
+                                                                        { 2,5,0,4,6,1,3,7 }
                                                                 };

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 801

Legend:

Download in other formats: