merge G5

diff --git a/.Xmodmap b/.Xmodmap
index e50069353400d43ca6e0425c66e07067107cb59f..6b0dd4d6d33f38c69ffa169b6b4ca69566ca9524 100644 (file)
--- a/.Xmodmap
+++ b/.Xmodmap
@@ -1,4 +1,7 @@
+! /usr/share/X11/XKeysymDB
 ! /usr/include/X11/keysymdef.h
+! http://gentoo-wiki.com/HOWTO_Use_Multimedia_Keys
+
 ! These turn caps lock key into a modifier for generating
 ! umlauted characters ... to toggle caps lock, hold shift
 ! while hitting it
@@ -25,10 +28,42 @@ keycode 10 = 1 exclam exclamdown onehalf
 keycode 54 = c C ccedilla Ccedilla
 keycode 24 = q Q egrave Egrave
 
-!http://gentoo-wiki.com/HOWTO_Use_Multimedia_Keys
 keycode 174 = XF86AudioLowerVolume
 keycode 176 = XF86AudioRaiseVolume
 keycode 160 = XF86AudioMute
 
 !Rebind Pause to Break
 !keycode 110 = Break
+
+!Rebind stupid apple keyboards
+! left apple  = 115
+! right apple = 116
+!keycode 115 = Alt_L Meta_L
+!keycode 116 = Alt_R Meta_R
+! left option = 64
+! right option = 113
+!keycode 64 = Alt_L Meta_L
+!keycode 113 = Alt_L Meta_R
+! vol down = 174
+! vol up   = 176
+! vol mute = 160
+!keycode 174 = XF86AudioLowerVolume
+!keycode 176 = XF86AudioRaiseVolume
+!keycode 160 = XF86AudioMute
+! F13 = 182
+! F14 = 183
+! F15 = 184
+! F16 = 93
+!keycode 182 = F13
+!keycode 183 = F14
+!keycode 184 = F15
+!keycode 93  = F16
+! eject
+!keycode 204 = XF86Eject
+
+! logitech keyboard
+!keycode 129 = XF86AudioMedia
+!keycode 162 = XF86AudioPlay
+!keycode 164 = XF86AudioStop
+!keycode 153 = XF86AudioNext
+!keycode 144 = XF86AudioPrev

diff --git a/.bashrc b/.bashrc
index cf0e1db5177321453e20b1b6a808362851169d4e..e97e7472d4c63e3051bf93f65838e824c5feea65 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -15,6 +15,7 @@ export HISTFILESIZE=10000
 export HISTSIZE=${HISTFILESIZE}
 export LESS="-R --tabs=4 -M -#10"
 export LESSCOLOR=0
+unset LDPATH # KDE bs
 
 shopt -s checkwinsize
 

diff --git a/.gitignore b/.gitignore
index 3c1f6d0bb35e3f427478339e7c23cebd664fd55a..e8c0ad6d8028bb8b4281f72b16f7042c99ed419f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,9 @@ a.out
 /.dmrc
 /.gnomerc-errors
 /.ICEauthority
+/.ktorrent.lock
 /.pulse-cookie
+/.serverauth.*
 /.sudo_as_admin_successful
 /.Xauthority
 /.xsession-errors*
@@ -23,6 +25,7 @@ a.out
 /.*_history
 /.cgdb/readline_history.txt
 /.clive/recall
+/.fbhighlevelshistory
 /.gconfd/saved_state
 .gdb_history
 /.gitk
@@ -62,6 +65,7 @@ a.out
 /.xchat2/scrollback/
 
 # Packages i don't care about
+/.clive/
 /.crash_report_*
 /.audacious/
 /.crack-attack/
@@ -95,7 +99,8 @@ a.out
 /.ncftp/firewall
 /.ncftp/history
 /.ncftp/init_v3
-/.ncftp/trace
+/.ncftp/log
+/.ncftp/trace*
 
 /.pan2/accels.txt
 /.pan2/article-cache

diff --git a/.profile.d/PS1.sh b/.profile.d/PS1.sh
index 0f48aea33b17923b55cdf074c94cbec8d66ebc93..943263541cf7a60f24fefe3e6c6d48cbed7adbb5 100644 (file)
--- a/.profile.d/PS1.sh
+++ b/.profile.d/PS1.sh
@@ -1 +1 @@
-PS1='\[\e[0;33m\]\u\[\e[30;1m\]@\[\e[31;1m\]\h\[\e[30;1m\] \j:$? \[\e[34;1m\]\W \$\[\e[0m\] '
+PS1='\[\e[0;33m\]\u\[\e[30;1m\]@\[\e[31;1m\]\h'`cat /etc/ps1_append`'\[\e[30;1m\] \j:$? \[\e[34;1m\]\W \$\[\e[0m\] '

diff --git a/.tgdb/a2_gdb_init b/.tgdb/a2_gdb_init
index 035cf02123bb4bd55d691eb9c134b86aaf7de25d..978d9bf1a8806d9adf46e8e342f66d13a364a4eb 100644 (file)
--- a/.tgdb/a2_gdb_init
+++ b/.tgdb/a2_gdb_init
@@ -1,3 +1,3 @@
 set annotate 2
 set height 0
-set prompt (tgdb) 
+set prompt (gdb) 

diff --git a/TODO b/TODO
index 0824dda5b1490d40d0bf2a6bf28c5ef576594d08..8c1b77a1bf71e3e92554147b951e5af174fce561 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,31 @@
+Add support for -lsystem to gcc (like -isystem)
+
+ldr-utils - add support for init sections and multiple init blocks
+
+u-boot:
+       - add -elf2ldr
+       - look into struct passing for boot
+       - convert to C !
+       - setup error handler with newer bootroms (ErrorFunction)
+       - for ldr env, make sure to 0xff fill rather than 0x00
+       - only need one of CFG_ENV_OFFSET and CFG_ENV_ADDR
+       - add support for more commands
+               - mii
+               - spi - need to implement spi_xfer()
+       - CONFIG_RMII vs BLACKFIN_MII ?
+       - for POST code, force it into LDR and only have it work when booting
+         from an LDR.
+       - add net console -- make sure booting up with it works
+       - net console: tftp doesnt work ?
+       - add support for bedbug
+       - bind BF54x RTS/CTS to CONFIG_HWFLOW and convert BFIN_BOOT_UART_USE_RTS
+       - relocate RTS cruft to serial.h out of initcode
+       - bf54x initcode seems to not work with early serial debug on power reset ?
+         - default baud rate depends on CONFIG_CLKIN_HZ which does not match that
+           of the reset clock ?
+       - i2c (for mainline only)
+               - implement newer functions (bus/speed)
+
 gforge frs sort is fucked
 
 .romfs does not get a PHDR, but it works because u-boot reads section