Non-local free-energy density-functional theory applied to the electrical double layer: Part II: 2:1 electrolytes