I'd like to unify the ck804_early_setup[_car].c files.  The differences are very minor, as you can see from ck804.  This patch applies after removing the CK804B defines since they are copies of other defines (with the same values) car_white.diff.